Commit graph

67 commits

Author SHA1 Message Date
dho
78d38fe5eb Adding fix for security exploit (#1429) to /templates/skel/webroot/js/vendors.php
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3507 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-18 05:54:46 +00:00
gwoo
ab56074c40 adding changes to bake.php in 1.2.x.x
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3496 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-15 20:19:03 +00:00
dho
6af78cde12 Adding folder for custom tasks and a task to create the application skeleton
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3465 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 09:05:12 +00:00
dho
5dcd93f0ff Adding execute function to interface
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3457 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 14:11:21 +00:00
dho
4df649dae5 Adding help function
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3456 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 13:50:23 +00:00
phpnut
eb202d44f9 Merging fixes into trunk:
Revision: [3440]
Adding note to api doc of the redirect function (#1358)

Revision: [3439]
Revoking previous change, fixing bug in api doc

Revision: [3432]
added fix for #1352

Revision: [3430]
Adding nl2br in Sanitize::html

Revision: [3420]
Typo fixed

Revision: [3383]
Refactoring last commit for admin check

Revision: [3382]
Adding fix for admin being searched in entire string

Revision: [3379]
Fixing errors when CSS not showing after recent fixes to error class

Revision: [3376]
Backporting string-escaping fix from 1.2 for Ticket #

Revision: [3373]
Adding Windows-specific port delimiter for connecting to SQL Server (Ticket #1261).

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3454 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-07 19:23:27 +00:00
dho
1cb3a46703 Typo fixed
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3420 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:27:03 +00:00
dho
bb1d4ce23c Renaming Task to BakeTask
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3417 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-21 12:13:03 +00:00
nate
fd99791566 Removing all references to AUTO_OUTPUT, adding HtmlHelper::meta() for creating <link /> tags, and enhancing HtmlHelper::url()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3414 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-20 21:54:50 +00:00
dho
d9a8b09653 Adding support for 3rd party bake tasks
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3413 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-20 08:16:04 +00:00
dho
f12f312b2e Adding missing constants
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3405 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 07:33:33 +00:00
dho
a00c14ec0d Adding base class for bake tasks
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3403 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-17 08:32:51 +00:00
dho
883844a78e Adding infrastructure for a more flexible bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3402 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-16 16:20:55 +00:00
nate
8a9b882f0c Making same fixes as [3336]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3337 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-01 02:47:40 +00:00
nate
f8123f131a Duplicating fixes in [3329]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3330 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-01 02:19:34 +00:00
phpnut
303c366a2e Merging fixes into branched code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3312 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 05:58:31 +00:00
phpnut
5549ddfd75 Replacing labelTag with new label().
Merged changes to bake.php


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3305 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 16:52:36 +00:00
phpnut
aee87dcdda Merging changes to bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3297 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 19:06:21 +00:00
phpnut
e2937c405e Merging changes to bake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3296 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-23 18:59:52 +00:00
dho
67d75ba18b Adding ; after endifs (ticket #1195)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3278 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-22 06:09:11 +00:00
dho
49ca6981ca Applying patch to add docblocks (ticket #1171)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3273 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-18 11:11:44 +00:00
phpnut
6d71310f00 Beginning to port fixes to 1.2.x.x code from 1.1.x.x
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3268 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-15 03:36:53 +00:00
phpnut
e9c3f1ad81 Added fix for Ticket #1082
Fixed lowercased model name being generated in bake.php

Removed $this->viewPath from generated controller classes

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3215 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 17:39:51 +00:00
phpnut
25fc73660c Fixing Fatal error: Call to undefined method HtmlHelper::submitTag()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3210 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-07 01:37:12 +00:00
phpnut
a24b5a32d8 Removing useless echo the baked view.thtml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3184 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-25 19:16:21 +00:00
gwoo
12e511477c updating 1.2.x.x generic css
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3162 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-22 21:58:42 +00:00
gwoo
93036b8681 updating skel home.thtml
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3160 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-22 21:07:03 +00:00
phpnut
8c6b0576af Merging changes from 1.1.x.x branch:
[3157]

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3158 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-22 20:42:53 +00:00
dho
be03e8150c Adding missing semicolon which is shown as syntax error in PHPEclipse
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3156 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-21 07:58:54 +00:00
dho
dfa6e140fa Added missing word
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3151 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-20 12:24:48 +00:00
phpnut
b242f56655 Adding fix for Ticket #1036.
This corrects: "No such file" error with bake.php when choosing to 
include basic class methods message


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3143 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 20:02:36 +00:00
dho
6cca0d00ea Merging changes on bake.php from 1.1.x.x branch [3138]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3139 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 15:00:17 +00:00
dho
c477ab64c6 consistent use of "Bake" in help text
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3137 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 07:23:27 +00:00
phpnut
a0743d40e7 Corrected bad char in [3134]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3135 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:47:08 +00:00
phpnut
e7b26eed83 Added fix for Ticket #1019.
bake.php on windows adding slash before filepath when creating unit test files

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3134 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:44:18 +00:00
phpnut
9d19dee879 Renaming branched version directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.1.x.x@3085 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 18:02:37 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2958 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-26 05:29:17 +00:00
phpnut
5e268e0805 Merging fixes into 1.x.x.x branched code:
Revision: [2802]




git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
f5a4a58758 Renaming directory for 1.x.x.x code base
git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2771 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-07 03:35:58 +00:00
phpnut
e41214da87 Merging fixes into 1.x.x.x branched code:
Revision: [2706]
Adding check for selecting insert id's

Revision: [2701]
Adding fix for Ticket #727

Revision: [2700]
Added patch from Ticket #730

Revision: [2698]
Added fix for Ticket #732

Revision: [2696]
More dbo_source::order() fixes

Revision: [2695]
Adding fix for order(), and results checking in __filterResults()

git-svn-id: https://svn.cakephp.org/repo/branches/1.0.0.2685@2727 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-04 00:35:48 +00:00
phpnut
4a8c03ef1c Merging fixes into the trunk.
Revision: [2618]
Adding fix for Ticket #609

Revision: [2617]
Added fix for Ticket #684

Revision: [2616]
Adding patch from Ticket #649

Revision: [2615]
Adding fix for Ticket #608

Revision: [2614]
Additional fix for Ticket #584

Revision: [2613]
Adding fix for Ticket #584

Revision: [2612]
Added fix for undefined index notices

Revision: [2609]
Adding fix for Ticket #658

Revision: [2608]
Adding fix for Ticket #635, and code formatting fixes in FormHelper

Revision: [2607]
Adding fix for Ticket #636

Revision: [2606]
Adding fix to allow associations to be defined through non-associative arrays

Revision: [2605]
Adding fix for Ticket #672

Revision: [2604]
Adding fix for Ticket #708

Revision: [2603]
Adding fix for Ticket #687

Revision: [2602]
Refactoring database drivers, and adding fix for Ticket #398

Revision: [2601]
Merging change from model_php5.php

Revision: [2600]
Adding ODBC driver

Revision: [2599]
Adding fix for Ticket #702

Revision: [2598]
Adding fix for Ticket #699

Revision: [2597]
Fixing an issue in Model::set(), and moving limit() to DboSource

Revision: [2595]
Fixing unit test download URL in Bake

Revision: [2594]
Adding fix for Ticket #698

Revision: [2593]
Adding fox for Ticket #231

Revision: [2592]
Adding fix for Ticket #630, and updating MS SQL driver docstring

Revision: [2577]
Adding $alias property to enable future Oracle support

Revision: [2568]
Merging changes to bake from old sandboxes

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2620 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-27 10:04:08 +00:00
phpnut
8dccd44856 Merging fixes to trunk:
Revision: [2559]
Adding fix for Ticket #666

Revision: [2534]
Adding fix for Ticket #683

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2560 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 21:22:56 +00:00
phpnut
4babd8b9c2 Merging changes to model_php4.php
Merging changes to bake.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2530 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:38:16 +00:00
phpnut
32f9e1e0e5 Merging fixes into trunk.
Revision: [2522]
renamed Bake class file

Revision: [2521]
removing old bake scripts

Revision: [2520]
Adding new Bake script

Revision: [2519]
Adding fix for Ticket #622

Revision: [2518]
Adding fix for Ticket #535

Revision: [2517]
Adding fix for Ticket #648, associated records are now post-processed by afterFind() method in associated model

Revision: [2516]
Adding fix for Ticket #618

Revision: [2515]
More error page fixes

Revision: [2514]
Adding fix for Ticket #690

Revision: [2513]
Removing empty method

Revision: [2512]
Adding fix for Ticket #675

Revision: [2511]
More fixes for Ticket #670

Revision: [2510]
Adding fix for Ticket #670, and removing pointless part of Helper::output(), since print() *always* returns 1.

Revision: [2509]
Adding fixes for Tickets #677 and #681

Revision: [2508]
Added patch from Ticket #632

Revision: [2502]
Adding fix to prevent model ID from getting overwritten when saving HABTM data [TEST ME] - thanks sdevore

Revision: [2501]
Rewriting foreach loops in queryAssociation()

Revision: [2493]
Adding fix for Ticket #673

Revision: [2492]
Adding reconnect() method, to reconnect to database with different settings

Revision: [2491]
Adding Microsoft SQL Server driver [EXPERIMENTAL]

Revision: [2490]
Fixing a bug that occurs when connecting to two different databases on the same server, and enabling cross-database model associations

Revision: [2488]
Adding fix for Ticket #651

Revision: [2487]
Adding fix for Ticket #665

Revision: [2486]
Adding fix for Ticket #655

Revision: [2485]
Forcing DboMysql to validate disconnect, and adding fix for Ticket #663

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2528 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-24 16:24:57 +00:00
phpnut
23b0101ff8 Merging fixes and enhancements into trunk.
Revision: [2413]
Adding fix for Model::bindModel() when association name is different from className setting in the array.
Removed second param in Model::__generateAssociation() that was not used.
Removed unneeded foreach() in Model::__createLinks().

Revision: [2412]
Adding fix for Ticket #564 

Revision: [2411]
Adding fix for Ticket #596.
Also found other variables that where not used properly

Revision: [2410]
Added fix for Ticket #561


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2414 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 17:31:33 +00:00
phpnut
23d183e46b Merging fixes and enhancements into trunk.
Revision: [2369]
Added missing doc comments to classes

Revision: [2368]
Removing core view paths from Configure class

Revision: [2367]
Updating View class to use new Configure class to search paths for view files

Revision:[ 2366]
Corrected loadControllers() in basics.php

Revision: [2365]
Updating function in basics.php to use new Configure class

Revision: [2364]
removed duplicate loading of app/config/bootstrap.php

Revision: [2363]
Added new Configure class to hold paths to models, views, and controllers related to Ticket #470.
Moved loading of app/config/bootstrap.php to Configure class from app/webroot/index.php.
Added creating instance of Configure instance in cake/bootstrap.php
Added example of setting custom paths in app/config/bootstrap.php 
Corrected error in Object::_savePersistent().

Revision: [2362]
Added fix for Ticket #534

Revision: [2361]
Refactoring persistent code a little more.
File now holds a variable with the serialized class and is include vs. reading file contents.

Revision: [2360]
Refactored persistent methods to use cache()

Revision: [2359]
Fixing array_combine() Warning in  Model::generateList()

Revision: [2358]
Set var $persistModel to false by default

Revision: [2357]
Moved persistent code to Object class.
Moved $TIME_START variable to top of file.
added __sleep methods for models

Revision: [2356]
Reverting persistent changes to Model class

Revision: [2355]
Adding fix for Ticket #550

Revision: [2354]
Corrected errors in persistent code

Revision: [2353]
Corrected overwrite in the model/model_php4.php file.

Revision: [2352]
Adding persistent methods to Model class.
This will allow caching of classes.
Added app/tmp/persistent directory.

Revision: [2351]
Reverting changes to dbo_source.php in [2350]

Revision: [2350]
Removed name pattern matches related to Ticket #534

Revision: [2349]
Adding fix for Ticket #548

Revision: [2348]
Adding fixes from Ticket #547.

Revision: [2347]
Adding fixes from Ticket #546.

Revision: [2346]
Adding fix for Ticket #527

Revision: [2345]
Refactored Html::url()

Revision: [2344]
Last fix for Ticket #483 

Revision: [2343]
Updating last commit

Revision: [2342]
Adding fix for Ticket #483

Revision: [2341]
Adding fix for Ticket #543, DBO will now only cache SELECT queries

Revision: [2340]
Adding session_write_close() to the CakeSession::__regenerateId()

Revision: [2339]
Adding patch from Ticket #544

Revision: [2338]
Adding patch from Ticket #529

Revision: [2337]
Adding patch from Ticket #528

Revision: [2336]
Removing the converting of \n to <br /> in Sanitize::html()

Revision: [2335]
Added bash script from Ticket #533

Revision: [2334]
Added enhancement for Ticket #474

Revision: [2333]
Correcting errors introduced with prior fix

Revision: [2332]
Correcting errors introduced with prior fix

Revision: [2331]
Performance optimization for NeatArray::findIn(): replaced foreach loop with for

Revision: [2330]
Minor performance optimization: Replacing all occurrences of low() with strtolower()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2370 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-19 03:26:43 +00:00
phpnut
fb46bcceef Merging fixes and enhancements into trunk.
Revision: [2316]
Added fix for message:  Warning: array_diff(): Argument #2 is not an array in Controller::__construct()

Revision: [2315]
Adding fix for Ticket #517

Revision: [2314]
Corrected scaffold throwing errors when irregular words are used for model/table names

Revision: [2313]
Added patch from Ticket #495.
Added missing ?> bracket at end of file

Revision: [2312]
Corrected model names being set to lower case, When matched to an irregular word in Inflector methods.
Added custom inflections.php file to allow application to have custom inflection rules.
Correct variable in View::renderCache(). error thrown if time class was used $time variable changed to $timeStart.

Revision: [2311]
Corrected $db placed in wrong section of the method

Revision: [2310]
Removing the db attribute from the model, This will help better with persistent objects

Revision: [2309]
Adding fix for Ticket #490

Revision: [2308]
Update to previous commit

Revision: [2307]
Removing references to Model->db. DataBase connections are now singleton-only.

Revision: [2306]
Refactoring getDataSource() into loadDataSource() and enumConnectionObjects()

Revision: [2305]
Reverting changes to this file

Revision: [2304]
Fixing Ticket #496, getColumnType, and docstrings

Revision: [2303]
Adding fix for Ticket #510


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-15 20:45:59 +00:00
phpnut
03ba042f41 Merging fixes and enhancements into trunk.
Revision: [2193]
Adding fix for Ticket #471

Revision: [2192]
Adding fix from Ticket #464.

Revision: [2191]
Adding fix for Ticket #461

Revision: [2190]
Adding fix for array_merge_recursive() error when unbindModelis used

Revision: [2189]
merging changes made in model_php5.php

Revision: [2188]
Fixing controller so $viewPath can be set as a var

Revision: [2186]
Adding Security component

Revision: [2185]
Adding additional RequestHandler detection, form security authentication, and automagic view variable $data

Revision: [2183]
Fixing Ticket #473

Revision: [2182]
Adding fix for Ticket #261

Revision: [2181]
Changing MySQL column defs from 12 hour times to 24 (#465)

Revision: [2180]
Fixing Tickets #463 and #462, and an error in Controller::setAction()

Revision: [2179]
Fixing a bug I found in AjaxHelper::link(), and changing the stopwatch time to 4 decimals

Revision: [2177]
Added patch from Ticket #459

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2195 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-08 03:13:32 +00:00
phpnut
f37dfb6302 Merging fixes and enhancements into trunk.
Revision: [2133]
Fixing sub package doc tag

Revision: [2132]
Added fixes when ini_set() is disabled.                   
Problem reported here:
    http://groups.google.com/group/cake-php/browse_thread/thread/f8e537b165da733e/06888a4112345f59

Revision: [2131]
"Correcting subpackage doc block tags "

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2134 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-25 19:20:18 +00:00
phpnut
27c5a4919a Merging fixes and enhancements into trunk.
Revision: [2076]
Correcting a few more bugs found in the CakeSession class

Revision: [2075]
Adding fix fro Ticket #417

Revision: [2074]
Corrected name of method

Revision: [2073]
Added patch submitted by lemp on IRC channel

Revision: [2072]
Added fix for Ticket #418.
Bug fix added for session_destroy();

Revision: [2071]
Updated DboSource::conditions() with regex discussed in IRC channel.
Added --return delimiter to allow returning the value of an array key without
the string being wrapped by $this->Model->value();

It is used like:
    $this->Model->find(array('Model.field' => '--return STRING'))

Revision: [2070]
Changed the DboSource::condition().
New syntax has been added.
By default all conditions are joined using AND.
    array('Model.field' => ' = value','Model.field' => ' > value');
    `Model`.`field` = 'value' AND `Model`.`field` = 'value'

To change this you would add a space CONDITIONAL space to the array key
Incorrect: array('Model.field' => ' = value','OR Model.field' => ' > value');
Correct: array('Model.field' => ' = value',' OR Model.field' => ' > value');

would produce
    `Model`.`field` = 'value' OR `Model`.`field` = 'value'

Change where also made the the value of the key space OPERATION space is now needed.
Incorrect: array('Model.field' => '= value';
Correct: array('Model.field' => ' = value';

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2077 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-20 22:19:21 +00:00