Commit graph

56 commits

Author SHA1 Message Date
phpnut
965874ccae Merging fix from 1.1.x.x branch
[3132]
Adding patch from Ticket #1004.
This fixed problem with table prefix not being used when querying for the last record id

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3133 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-19 01:08:52 +00:00
nate
14d5d8e979 Adding fix for Ticket #896
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3108 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-15 13:18:01 +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
1dc168abc7 Merging fixes into 1.x.x.x branched code:
Revision: [2887]

git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2890 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-16 20:46:06 +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
0c0dec8bc0 Merging fixes into the trunk.
Revision: [2629]
Fixed recursive associations when set to 0, did not add the hasOne or belongsTo in the query.
Changed scaffold to use recursive setting of 0 in all methods that call Model::findAll()
Fixed Invalid argument supplied for foreach() notice in show.thtml
Removed 500 record limit in Controller::generateFieldNames()

Revision: [2628]
Merging changes from model_php5.php

Revision: [2627]
Fixing messed up characters in dbo_odbc, adding docstrings, and giving connect() a return value

Revision: [2625]
Bringing all DB drivers up to date

Revision: [2624]
Changed fixed for Ticket #609 so and empty array is set instead of null.
This is more consistent with the other arrays that are returned if an association is found

Revision: [2623]
Adding fix for Ticket #712

git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2630 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-28 05:26:06 +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
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
a95a8c0a61 Merging fixes and enhancements into trunk.
Revision: [2478]
Merging differences between model_php4.php and model_php5.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2479 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-11 15:55:53 +00:00
phpnut
e3cadc0eb4 Merging fixes and enhancements into trunk.
Revision: [2470]
Adding fix for Ticket #653

Revision: [2469]
Adding fix for Ticket #652

Revision: [2468]
Enabling table list caching for DB DataSources

Revision: [2467]
Adding fix for Ticket #623

Revision: [2466]
Adding fix for Ticket #652

Revision: [2465]
More dbo_source::order() fixes, moving query() to dbo_source, and supporting additional find/findAll parameters in magic find methods

Revision: [2464]
Adding fixes for Ticket #610

Revision: [2463]
Adding an alias fix in DBO_Source, and an IIS rewrite patch for setUri()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2477 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-11 15:46:29 +00:00
phpnut
c899c085f5 Merging fixes and enhancements into trunk.
Revision: [2448]
removing tabs in last commit

Revision: [2447]
Adding fix for limit in all associations

Revision: [2446]
Added fix for Ticket #569

Revision: [2443]
Adding fix for Ticket #592.

Revision: [2437]
Adding fix for Model::findNeighbours().
Was returning all associations and fields. Now recursive is set to 0 and only returns the prev and next keys array

Example $this->Category->findNeighbours(null, 'Category.id', 4);

Will return,

Array
(
    [prev] => Array
        (
            [Category] => Array
                (
                    [id] => 3
                )

        )

    [next] => Array
        (
            [Category] => Array
                (
                    [id] => 5
                )

        )

)

Revision: [2432]
Removed the DS constant from the plugin var when it is set in Dispatcher.
Added "$this->plugin.DS." constant in files where needed after change above.
Added fix for Ticket #577.

Revision: [2428]
Added fix for HtmlHelper::checkbox() it ignored the value provided as a parameter
Fix for Ticket #605.
Fix for Ticket #607.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2449 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-28 19:46:59 +00:00
phpnut
c141859d3a Merging fixes and enhancements into trunk.
Revision: [2420]
Added fix for Ticket #320.
Fixed Model::save() so it will only allow a model to save itself.
Fixed Model::save() when saving a HABTM association

Revision: [2419]
Added fix for Ticket #463

Revision: [2418]
Added patch from Ticket #598

Revision: [2417]
Added fix for Ticket #581

Revision: [2416]
Adding fix for Ticket #579

Revision: [2415]
Adding patch from Ticket #597

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2421 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-26 19:15:30 +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
d6f056d5c0 Merging fixes and enhancements into trunk.
Revision: [2328]
Merging changes from model_php5.php

Revision: [2327]
Fixing queries that don't respect model aliases in conditions clauses

Revision: [2326]
Adding in-memory query caching to DBO_Source, and Model->cacheQueries property to control the behavior

Revision: [2325]
A recovering discarded association data for recursive belongsTo joins


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2329 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-16 05:33:47 +00:00
phpnut
1e666b23bb Merging fixes and enhancements into trunk.
Revision: [2323]
Adding SQL error message display.
Fixed  Invalid argument supplied for foreach() in dbo_source.php on line 472

Revision: [2322]
Fixed undefined index datasource.php on line 438

Revision: [2321]
Adding error messages for ConnectionManager if no database file is present.

Revision: [2320]
Merging changes from model_php5.php

Revision: [2319]
Removing $this->validationErrors = null; in Model::set();

Revision: [2318]
Refactoring Model::invalidFields()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2324 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-16 01:50:55 +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
fc0854e397 Merging fixes and enhancements into trunk.
Revision: [2287]
Merging changes from model_php4.php

Revision: [2286]
Added serialized object data to the cached file.
Instances of the view helpers are available in the views now.
You also have access to the Controller::<component>, example $this->controller->Session;

Revision: [2285]
Adding Controller::postConditions() to convert a POST'ed data array to a Model conditions array

Revision: [2284]
Adding Model::invalidate() and refactoring Model::invalidFields().  Adding a fix for RequestHandler::accepts()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2288 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 02:26:08 +00:00
phpnut
2862d11796 Merging fixes and enhancements into trunk.
Revision: [2270]
Refactored clearCache()

Revision: [2269]
Removed timestamp in file name.
Removed debug code in model_php5.php


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2271 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 09:31:36 +00:00
phpnut
54df7c300f Merging fixes and enhancements into trunk.
Revision: [2267]
Removed the 50 record limit on the Model::findAll().
Added _ between file and timestamp
Fixed error thrown when variable was not an array


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2268 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 08:56:11 +00:00
phpnut
c439ed8742 Merging fixes and enhancements into trunk.
Revision: [2263]
Fixed Model::_clearCache() not having the name of the current model in the $assoc array

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2264 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 07:23:40 +00:00
phpnut
3d3d083f30 Merging fixes and enhancements into trunk.
Revision: [2261]
Adding fix for Ticket #479.
Removed unused $alias variable.

Revision: [2260]
Merging changes from model_php4.php

Revision: [2259]
Added Model::_clearCache(). This is used to delete cached pages when changes are made to a model,
will also be used to delete cached queries

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2262 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 06:58:53 +00:00
phpnut
89fbf1c8bf Merging fixes and enhancements into trunk.
Changing version number to 1.x.x.x, 0.10.x.x code base had been changed to the version number 1.x.x.x, and what was planned for 1.x.x.x code has
now been moved to 2.x.x.x, and 2.x.x.x moved to 3.x.x.x. This will give us easier to track version numbers from now on.

Revision: [2248]
Merging changes from model_php5.php

Revision: [2247]
"Removing test code from view class"

Revision: [2246]
Removed cache time define from core.php.
Modified the __() function in basics.php to echo string like it will in later versions of cake with translations.
Refactored the cache checking in bootstrap.php to read the files embedded time stamp and delete or output the cached version.
Added View::cacheView() for caching pages.


Revision: [2245]
Moving column formatting from DBO to Sanitize

Revision: [2244]
Adding beforeValidate() Model callback, and allowing query data to be modified in beforeFind()

Revision: [2243]
"Adding caching changes to Controller class "

Revision: [2242]
"Added check to delete cached version if it has expired"

Revision: [2241]
Adding app/cache/views directory

Revision: [2240]
"Fixed missing variable"

Revision: [2239]
"Adding full page caching to view class."

Revision: [2238]
"Adding defines for caching"

Revision: [2237]
"Adding caching check too bootstrap.php"

Revision: [2236]
Adding ClassRegistry::removeObject from Ticket #477

Revision: [2235]
"Correcting setting in DATABASE_CONFIG class"

Revision: [2231]
Adding convenience function am(), which allows merging an infinite number of arrays merged into one

Revision: [2207]
Change Model::save() to call beforeSave() before validations

Revision: [2199]
Removing conditions method call in Model::field()

Revision: [2196]
Setting proper mime type again

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2250 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 00:11:40 +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
f6cf220c40 Merging fixes and enhancements into trunk.
Revision: [2175]
Merging changes made to model_php5.php

Revision: [2174]
Adding fix for empty values being set for an update.
Fixed problem with view paths being set wrong on Windows.

Revision: [2173]
Adding additional condition operators

Revision: [2172]
Adding fix for Ticket #455

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2176 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-02 06:23:16 +00:00
phpnut
9c5e3bb979 Merging fixes and enhancements into trunk.
Revision: [2168]
Added patch from Ticket #458

Revision: [2167]
Merging changes made to model_php5.php

Revision: [2166]
Added methods to allow what is discussed in Ticket #452

Revision: [2165]
Added fix for Ticket #453

Revision: [2164]
Added DBO column abstraction and column-based data formatting/escaping

Revision: [2163]
Added patch from Ticket #457.
Added fix for Ticket #456.

Revision: [2162]
"Added fix suggested in Ticket #454"

Revision: [2161]
"Diff added + symbol, removed it"

Revision: [2160]
"Added all fixes for Ticket #448"

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2169 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-01 19:13:48 +00:00
phpnut
6cc1cf8b80 Merging fixes and enhancements into trunk.
Revision: [2151]
Merging changes made to model_php5.php into model_php4.php.

Revision: [2150]
Cleaning up code, removing in line comments

Revision: [2149]
Fixed wrong params passed to SessionComponent::setFlash() in Scaffold class.
Changed View::_render() to only suppress errors in the view when DEBUG is set to 0.

Revision: [2148]
Adding suggestion from Ticket #446.

Revision: [2147]
Added fix for Ticket #443

Revision: [2146]
Added fix for Ticket #444.
Added table.field in the CakeSession class database methods

Revision: [2145]
Renamed _new to _blank in default.thtml.
Starting to refactor changes that broke self joined associations.

Revision: [2144]
Adding fix for Ticket #202

Revision: [2143]
Adding support for nested array-based conditions

Revision: [2141]
Updating View for Session flash changes

Revision: [2140]
Adding Session flash enhancements for a ticket that I took but can't find because someone else closed it

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2152 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-28 07:35:01 +00:00
phpnut
e45d19e199 Merging fixes and enhancements into trunk.
Revision: [2104]
Correct changes of names in scaffold.

Revision: [2103]
Changed methods to protected methods
Controller::_beforeScaffold($method)
Controller::_scaffoldError($method)

Revision: [2102]
Added 2 methods to Controller class that must be overridden in child classes if you place to use Scaffold in production applications.
This will allow you to perform checks before displaying the forms, and also before performing any Scaffold methods.

Each of these methods are passed the name of the method they represent in Scaffold.
Controller::beforeScaffold($method)
Controller::scaffoldError($method)

These 3 name are passed to the methods above, but are not view related 
'create' when creating a new record in the database
'update' when updating a record in the database.
'delete' name says what it does

These are view related names passed to the methods above
'index' the list of all records shown in scaffold.
'edit' the edit record form.
'show' when displaying a specific record.
'add' add record form.


Scaffold can now be used to generate forms and customize these on a per app or per controller basis.
Scaffold will first look:
Example: app/views/posts/
Then: app/views/scaffold/

There are also specific naming used for these views each related to a scaffold method.

scaffold.list.thtml
scaffold.edit.thtml
scaffold.new.thtml
scaffold.show.thtml

Added scaffold_error.thtml that is used if a controller does not implement Controller::scaffoldError() when using scaffold and Controller::beforeScaffold() is implemented and returns false

Revision: [2101]
Corrected some bugs found in View that would cause errors when using scaffold.

Revision: [2100]
Added fix for Ticket #427 

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2105 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-23 11:40:52 +00:00
phpnut
8ab148a598 Merging fixes and enhancements into trunk.
Revision: [2087]
Removed array setting that is not needed

Revision: [2086]
Added unbindModel to turn off associations on the fly.
These are reset after a call to a find<*> method.
Added one more level key to isset check in DboSource::conditions.
Previous check would always return true.

Revision: [2085]
Refactored DboSource::fields()

Revision: [2084]
Added fix for Ticket #419    

Revision: [2083]
Refactoring DboSource::conditions.

Revision: [2082]
Deleted a few methods by accident adding them back

Revision: [2081]
Added fix for Ticket #420
Added $startQuote and $endQuote vars to the MySql class, these must be added to each Dbo<database> if the database uses
a quote char around fields. Example MySql uses this ` MSSQL uses [ and ].

Revision: [2080]
Added delete() alias for del() in Model and SessionComponent classes.
This is suggestion from Ticket #421

Revision: [2079]
Added fix for Ticket #106.
This was added before but lost in a merge.
This fix allows adding a custom tags.ini.php file to app/config.
This file will be merged with the core, overwriting any keys that match, and adding those that do not.

Revision: [2078]
Refactoring DboSource::conditions().

This method will now return the Model.field properly when passed a string.
You can also set you own clause.
WHERE, GROUP BY, HAVING, and ORDER BY.
If one of these in not the first characters in the string, WHERE will be added by deafult.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2088 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-22 09:15:12 +00:00
phpnut
4af9614115 Merging fixes and enhancements into trunk.
Revision: [2068]
Fixed typo in method names.
Updated DboSource::conditions().

Added a delimiter --return that would be used in a complex condition string.
NOTE: You limit your self to database specific code using this. Cake will not add the name() wrap around any of the 
Model.field.
    $this->Model->find('--return MY CUSTOM CONDITION STRING);

Added ability to use a array key that will not have $this->value() called to wrap the $value.
It is used like this (The word status will not have the value() called) 
Also note you can add Conditional selections used in the where clause:
=  	Equal
> 	Greater than
< 	Less than
>= 	Greater than or equal
<= 	Less than or equal
<> 	Not equal to
LIKE 	can also use % with this
    $this->Model->find(array('Model.field' => '= value', 
                             'Model.field' => '> value',
                             'Model.field' => '< value',
                             'Model.field' => '>= value',
                             'Model.field' => '<= value',
                             'Model.field' => '<> value',
                             'Model.field' => 'LIKE value',
                             'Model.field' => 'LIKE %value%',
                             'status',
                             'any key withou a => "value" wil not be wrapped'));

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2069 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-20 08:45:44 +00:00
phpnut
35997a1e84 Merging fixes and enhancements into trunk.
Revision: [2066]
Change the bindTo<ModelName>() to bindModel()
This works similar to before but has sytax as follows.

        $this->Book->bindModel(array('belongsTo' => 
                               array('Author' =>
                               array('conditions' => 'these conditions',
                                     'order' => 'this order by DESC',
                                     'foreignKey' => 'foreign key',))));




git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2067 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-20 05:09:48 +00:00
phpnut
02d90348f8 Merging fixes and enhancements into trunk.
Revision: [2064]
Added doc block for Model::__resetAssocitions();
Removed unused params in Model::__constructLinkedModel();

Revision: [2063]
Refactored bindTo<ModelName> to allow method to be used to change associations settings.                    
This method will change the association on the fly, and reset them back once the query has completed.
This will allow something like this simple example.

        $this->Book->bindToAuthor(array('belongsTo' => array('conditions'  => array('Author.active'=>'1'))));
        $this->set('changed', $this->Book->findAll());
        $this->set('original', $this->Book->findAll());

$changed would have the associated for Books/Authors where Author.active = 1.
$original would have the associations for Books that where set in the Book class association vars.

Revision: [2062]
Added magic method to allow late binding of association model.

Revision: [2058]
Adding fix for error in acl.php reported in google group

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2065 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-20 03:03:05 +00:00
phpnut
a6051579d7 Merging fixes and enhancements into trunk.
Revision: [2031]
Added ability to turn off the cascading deletes when using Model::del($id, false);

Revision: [2030]
Corrected association cascading for hasOne and hasMany.

Revision: [2029]
Implemented cascading delete for hasMany, and hasOne associations.

Revision: [2028]
Renamed Model::__deleteJoins() to Model::__deleteMulti();

Revision: [2027]
Implemented Model::__deleteJoins() to delete HABTM associations.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2032 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-19 01:54:39 +00:00
phpnut
a75e08976f Merging fixes and enhancements into trunk
Revision: [2025]
A little more work on plugin to set some default routing.

Revision: [2024]
Changed DboSource::field() so the name() is not called for some field variables.

Revision: [2023]
Changes made in [2022] should only check if the $conditions is not empty.

Revision: [2022]
Changed DboSource::conditions() so it will add the "ticks" needed around the Model.field names.
The Model.field name conventions must be used for this to work.

Revision: [2021]
Adding fix for Ticket #405

Revision: [2020]
Added fix for Ticket #403

Revision: [2019]
Added patch from Ticket #404.
Fixing formatting of files.

Revision: [2018]
Fixing formatting of files 

Revision: [2017]
Fixed bad search and replace

Revision: [2016]
Fixing formatting of files 

Revision: [2015]
Replaced all 3 space indents with 4 space indents

Revision: [2014]
Updating variables to use the naming proper conventions

Revision: [2013]
Added patch from Ticket #406

Revision: [2012]
Adding fix for Ticket #407.
Fix variables that where not formatted per the coding conventions

Revision: [2011]
Adding patch from Ticket #401

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2026 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-18 23:42:21 +00:00
phpnut
9a8d5c15fe Merging fixes and enhancements into trunk
Revision: [2009]
Adding fixes for session errors posted in the google group.
Changed the header for PHP version in the model classes.
Change uses() back to require_once 

Revision: [2008]
Adding reference back to the PHP 4 model

Revision: [2007]
Merging changes from model_php5

Revision: [2006]
Fixing recursive associations, adding whitelist to Model::save

Revision: [2005]
Added fix for error in CakeSession class.
Updated home.thtml

Revision: [2004]
Rearranged  some of the defines moving the most often changed ones to the top of the script

Revision: [2003]
Moved SQL files distributed with the core to app/config/sql/
Removed app/config/routes.php.default
Fixed class_exists check in TextHelper

Revision: [2002]
adding sql directory

Revision: [2001]
Fixed error when cake distribution is installed inside of the DOCUMENT ROOT 

Revision: [2000]
Adding checks for classes that are already loaded so the require() calls will not error

Revision: [1999]
Replacing all require_once() with require()

Revision: [1998]
Moved creation of the Dispatcher object to app/webroot/index.php

Revision: [1997]
Adding session sql file

Revision: [1996]
Revision: [1995]
Fixing session db queries

Revision: [1994]
Change the require_once in bootstrap to require.
Merged changes John made to the CakeSession database methods

Revision: [1993]
Removing some constants that are not needed

Revision: [1992]
Adding fix for Ticket #400

Revision: [1991]
Fixing Ticket #348

Revision: [1990]
Fixing Tickets #397 and #399

Revision: [1989]
Fixed callbacks in JavaScript events and Ajax, fixed Controller::beforeRender so you can set view variables, and fixed Ticket #394

Revision: [1988]
Renamed the $dir param to $direction.
Added default value to the DboSource::order() $direction param.

Revision: [1987]
Adding changes back to the sessions class I reverted in [1984]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2010 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-17 10:12:15 +00:00
phpnut
818806195f Merging fixes and enhancements into trunk
Revision: [1985]
Changed DboSource?::order() to allow passing an array in the order param

Revision: [1984]
Reverting changes from [1983]

Revision: [1983]
Merging change from [1966] and [1967]

Revision: [1982]
Adding fix for DboSource::order().
This allows setting the order in the find methods.

Revision: [1981]
cleaned up code

Revision: [1980]
Corrected the array keys in the regex I added

Revision: [1979]
Added check to DboMysql::value() that does not add quotes around a numerical value.
Refactored DboSource::conditions() adding better regex. 

Revision: [1978]
Added check for LIKE in a condition array this fixes the = being added.

Revision: [1977]
Added fix for Ticket #392

Revision: [1976]
Adding changes suggested in Ticket #381.
These have not been fully tested.

Revision: [1975]
Added fix for Ticket #391

Revision: [1974]
Added patch from Ticket #390

Revision: [1973]
Adding patch from Ticket #386

Revision: [1972]
Added patch from Ticket #385.
Changed wording of a comment.

Revision: [1971]
Added patch from Ticket #383

Revision: [1970]
Adding fix for Ticket #395

Revision: [1969]
Adding more detailed comment to path defines

Revision: [1968]
Making a few more changes to the path settings

Revision: [1965]
fixing path issue with loading PagesController

Revision: [1964]
Added model method for getting column types by field

Revision: [1963]
Corrected paths to the tmp directory.
Making a few more changes to the defines in index.php

Revision: [1962]
Moving tmp directory to app

Revision: [1961]
Starting separation of core from the application.

Revision: [1960]
Adding vendors directory to app directory

Revision: [1959]
Finished support for recursive associations.  Still needs some testing...

Revision: [1958]
Adding fix for Ticket #387, and automagic id's for form inputs

Revision: [1957]

Revision: [1956]
Adding fix for error reported in Google Group: http://groups.google.com/group/cake-php/browse_thread/thread/395593a3cea34174

Revision: [1955]
Adding fix for Controller::referer()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1986 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-16 09:29:28 +00:00
phpnut
e51b3d4915 Merging fixes and enhancements into trunk
Revision: [1948]
Added fix for Ticket #376

Revision: [1947]
Renamed log.php to cake_log.php

Revision: [1946]
Added fix for Ticket #371;
Moved LogError to bascis.php from log.php
Renaming Log class to CakeLog to avoid conflicts with Pear Log class or any other Log class.
Added check to File class to load Folder class if it is not in memory already
Moved LOG_ERROR define to app/config/core.php

Revision: [1945]
Updated Inflector::pluralize(); and Inflector::singularize(); to use some code that is in the new Inflector class from version 1.x.x.x
Added fix for Ticket #373
Added fix for Ticket #357
Added patch from Ticket #363

Revision: [1944]
Added fix for Ticket #349 PHP 5 version

Revision: [1943]
Added fix for Ticket #349

Revision: [1942]
Adding patches from Ticket #377

Revision: [1941]
Quick URL fix for AjaxHelper::editor

Revision: [1940]
Fixing Ticket #375

Revision: [1939]
Adding fix for Ticket #369, plus slider control and Ajax In-Place editor

Revision: [1938]
diff patched applied from gwoo



git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1949 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-08 15:25:34 +00:00
phpnut
50a71fa777 Merging fixes and enhancements into trunk
Revision: [1914]
Adding prefix setting to the database config class.
Setting the value here will use the prefix for all models.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1915 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 04:45:08 +00:00
phpnut
caba653885 Merging fixes and enhancements into trunk
Revision: [1903]
Fixing changes made in [1897]



git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1904 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-02 13:51:43 +00:00
phpnut
018538cee2 Merging fixes and enhancements into trunk
Revision: [1901]
More work on deeper associations.
Seems to work now, but going to test more.

Revision: [1900]
Getting closer with deeper joins.

Revision: [1899]
Committing changes made to recursive associations.

Revision: [1898]
Adding fixes for Tickets #188 and #195

Revision: [1896]
Adding controller callbacks

Revision: [1895]
A little more refactoring for Controller::redirect()

Revision: [1894]
Removed :// from Controller::redirect()

Revision: [1893]
Adding fix for Ticket #308.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1902 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-02 11:48:29 +00:00
phpnut
1748ac0318 Merging fixes and enhancements into trunk
Revision: [1891]
Added patch from Ticket #278

Revision: [1890]
Adding patch from Ticket #227

Revision: [1889]
Adding fix from Changeset [1631].
This fixes Ticket #319 

Revision: [1888]
Added fix for Ticket #315

Revision: [1887]
Adding patch from Ticket #312

Revision: [1886]
Adding fix that was committed in [1304] back.
Closing Ticket #77 again

Revision: [1885]
Fix added for Ticket #306
Added patch from Ticket #318
Added patch from Ticket #322

Revision: [1884]
Adding fix to Ticket #332

Revision: [1883]
Adding patch from Ticket #330

Revision: [1882]
Adding fix for Ticket #170 back to HtmlHelper::selectTag().
Was lost in a previous merge

Revision: [1881]
Adding fix for Ticket #336

Revision: [1880]
Adding fix from Ticket #307 

Revision: [1879]
Plugins will use their own helpers and components if present


Revision: [1878]
Basic implementation of plugins within app/plugins working.

Revision: [1877]
Starting plugin code for multiple apps within one app.

Revision: [1876]
Added Ticket #345.

Revision: [1875]
Added check to AcoAction class that would not attempt to load AppModel Class if it is already defined in memory
Added fixes for Ticket #317, Ticket #333, Ticket #343, Ticket #337

Revision: [1874]
Adding fix for Ticket #340

Revision: [1873]
Added themeWeb var to helpers that will be used if a theme class overrides the view class

Revision: [1872]
Adding $format to timeAgo and relativeTime, for gwoo

Revision: [1871]
Docstrings changes. One char at a time we map out Cake.

Revision: [1870]
Docstrings for Session, and corrections to tabbing on datasource.

Revision: [1869]
Docstrings for the core database classes.

Revision: [1868]
Adding patch for Ticket #131

Revision: [1867]
Allowing ajax link titles to not be escaped

Revision: [1866]
Changed error class so calls to ErrorHandler::error() in production setting will work.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1892 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-01 13:26:23 +00:00
phpnut
26d7620f1b Merging fixes and enhancements into trunk
Revision: [1855]
Forgot to merge changes between the PHP 5 and PHP 4 model classes

Revision: [1854]
Added fix to Model class so that setting var $useTable = false; will not try to create a datasource connection.
Added fix to basics.php in the file_put_contents function that would give a Warning :failed to open stream: File exists. 
This fix allows the file to be wrote to if it already exists.
Added fix for undefined notice in DboSource::generateAssociationQuery();
Added Model::$keyToTable to map foreign keys to thier proper tables so scaffold could work with them properly.
Fixed Controller::__generateAssociation() to use Model::$keyToTable.
Fixed layout issue with show view in scaffold.

Revision: [1853]
Added DataSource::buildSchemaQuery() which must be implemented in the child classes.
  This will be used to import a table schema.
Added DboMysql::buildSchemaQuery()
Added fix for Ticket #304 by reverting change made in [1825].
Reopened Ticket #286
Added fix for Ticket #310 

Revision: [1852]
Added fix for PHP Fatal error: Call to a member function on a non-object in... Controller::generateFieldNames() in PHP 4            
when using a HABTM association. 

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1856 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-22 05:12:28 +00:00
phpnut
2407160dc5 Merging fixes and enhancements into trunk
Revision: [1848]
Fixing references.

Revision: [1847]
Adding fix for errors when using scaffold.
On some version of PHP 4 some people where getting Call to member function on non-object...
in Controller::generateFieldNames() at line 494.

Fixed call to get_class_methods that was using the name of the class and not the instance of the class,
this would cause a Wrong datatype for second argument...


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1849 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 18:43:05 +00:00
phpnut
48c9bb3bbd Merging fixes and enhancements into trunk
Revision: [1843]
Added param $allowed to Sanitize::paranoid() this array will allow
passing characters that you do not want removed in the string.

Modified Sanitize::paranoid() to check an array.

Modified Model::findNeighbours() setting param $conditions to null by default.

Added fix for Ticket #294

Added fix to scripts/acl.php

changed DboSource::fields() to use the count() one time
instead of using it in the for loop also

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1844 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 09:37:15 +00:00
phpnut
73830ec0dc Merging fixes and enhancements into trunk
Revision: [1841]
Merging changes made in model_php5.php to model_php4.php

Revision: [1840]
Adding fix for PHP 5 when using mysql_connect setting.
Commented out the call to Dbo*::disconnect(). This was closing connections early.
Adding fixe for Ticket #302.
Adding Enhancement for Ticket #300.
Adding fix for Ticket #299
Adding Enhancement for Ticket #298
Adding fix for Ticket #297
Adding Enhancement/Patch from Ticket #296

Revision: [1838]
working on deeper recursive joins

Revision: [1837]
Updating copyright information in all files

Revision: [1836]
Adding fix when setting a field value to 0.
Before it would set this to NULL, which was not expected result.  


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1842 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 07:46:14 +00:00
phpnut
a74dd6a260 Merging fixes to trunk
Revision: [1834]
Few more changes to recursive associations.
These changes and the others that are being made
will allow deeper levels of associations. Currently 
this is only 1 level deep and can not go deeper until completed.

Revision: [1833]
Making changes to recursive associations 

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1835 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-18 06:46:28 +00:00
phpnut
afb97fc54d Merging fixes to trunk
Revision: [1823]
Adding one last fix to fields pulled in a query

Revision: [1822]
Copying changes made in model_php4.php to model_php5.php

Revision: [1821]
Fixed problem when passing fields to get from a table.
Working on deeper levels of associations.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1824 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 20:56:45 +00:00
phpnut
9ca1ce91d8 Merging fixes to trunk
Revision: [1815]
Adding the path.php require back, and removing the code that was in the path.php file.

Revision: [1814]
More work on Model.
Removed all code from app/webroot/index.php that is moved to the bootstrap file.
Added CAKE_SESSION_TIMEOUT define in app/config/core.php

Revision: [1813]
Adding a bootstrap file to remove need to edit index.php anymore

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1816 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 05:13:38 +00:00