Commit graph

17586 commits

Author SHA1 Message Date
phpnut
d2bd117486 Merging fixes and enhancements into trunk.
Revision: [2098]
Removed check for database class to load model classes from the models directory.
Fixed missing views not being found.

Revision: [2097]
Fixed the WWW_ROOT setting

Revision: [2096]
Changed the way Sessions component is added to the components array

Revision: [2095]
Moved the WWW_ROOT define.

Revision: [2094]
Components/Helpers etc. in AppController are now automatically added to all controllers

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2099 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-23 08:24:23 +00:00
phpnut
e16bb286e0 Merging fixes and enhancements into trunk.
Revision: [2092]
Added fix for = not being added the conditions.
Corrected paths for test suite.
  Test are now located in app/test/

Revision: [2090]
Added fix to DboSource::conditions() that will check for the escaped single quotes.
Before this fix any matching single quote pair could cause failure

Revision: [2089]
Fixed duplicate WHERE being added to the sql string

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2093 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-22 18:35:41 +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
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
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
91525f00ab Merging fixes and enhancements into trunk.
Revision: [2056]
Corrected typo in a variable name

Revision: [2055]
Added regex to remove ORDER BY if it is passed in the string

Revision: [2054]
A little refactoring to changes made in [2053]

Revision: [2053]
Adding fix for Ticket #413

Revision: [2052]
Reverting changes made in [2050]

Revision: [2051]
Fixing Ticket #410

Revision: [2050]
Fixing Ticket #409, and adding additional column functions

Revision: [2049]
Removing old DBO class. Fixes Ticket #408
Updated all Dbo* database classes to extent DboSource.
Corrected formatting of code in CakeSession 

Revision: [2048]
Adding fix for Ticket #411.
Updating variables and method to use coding standards.
Updated CakeSession doc blocks

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2057 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-19 22:14:21 +00:00
phpnut
9be62bcb7e Merging fixes and enhancements into trunk.
Revision: [2046]
One last refactoring of Dispatcher

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2047 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-19 06:26:05 +00:00
phpnut
528d0e837f Merging fixes and enhancements into trunk.
Revision: [2044]
Refactored and removed uneeded regex checks

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2045 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-19 06:10:12 +00:00
phpnut
49ca527459 Merging fixes and enhancements into trunk.
Revision: [2035]
Cleaning up code formating

Revision: [2034]
Added fix for parse error when using PHP 4

Revision: [2033]
Fixed dispatcher to set the proper paths when app/webroot is moved outside of a normal cake install path  
and placed deeper in the web path of the DOCUMNET ROOT

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2036 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-19 03:56:54 +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
40f3a01d1e Merging fixes and enhancements into trunk
Revision: [1953]
Added @ before session_destroy() in CakeSession::_destroyInvalid() to suppress warning 

Revision: [1952]
Fixing Ticket #380, and adding JSON object generator to JavascriptHelper

Revision: [1951]
Removing code that is not used in Inflector class

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1954 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-09 05:23:26 +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
ab34891751 Merging fixes and enhancements into trunk
Revision: [1936]
Adding fix for Ticket #364

Revision: [1935]
Adding script.ac slider control and fixing Ticket #188 for real this time

Revision: [1934] [1933] [1932] [1931] [1930]
Docstrings, and some inconsistency fixed. Wrong parameters in one case. Moved them into the signature. Also some code standards fiddling.
Some outdated parameters. Added a todo in docstrings.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1937 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-07 02:19:53 +00:00
phpnut
cd2d68a6c8 Merging fixes and enhancements into trunk
Revision: [1927]
A little refactoring on the findBy<field> and findAllBy<field>.
These should both work on PHP 4 now without an issue.
Change the condition to be built as an array in DboMysql::query().
Still want to refactor the DboSource::conditions() which is note around line 1058 TODO:

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1928 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-04 08:13:59 +00:00
phpnut
c2dcc10996 Merging fixes and enhancements into trunk
Revision: [1925]
Adding fix for association conditions when set in the association array

Revision: [1924]
Adding fixes for $recursive

Revision: [1923]
Adding fix from Ticket #362

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1926 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-04 07:33:20 +00:00
phpnut
934cfe1dac Merging fixes and enhancements into trunk
Revision: [1921]
Adding fix on default pages controller that does not use a model

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1922 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 15:05:46 +00:00
phpnut
0a7a4807da Merging fixes and enhancements into trunk
Revision: [1919]
Removed debug code.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1920 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 07:12:40 +00:00
phpnut
3229567cbd Merging fixes and enhancements into trunk
Revision: [1917]
Adding fix to pass args when using plugins.
Adding fix to allow plugin elements to be rendered properly

Revision: [1916]
Adding plugin layouts to search path if a plugin is being accessed.
If no layout is found then the app/views/layouts/*.thtml will be used.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1918 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 06:06:15 +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
d09a48d882 Merging fixes and enhancements into trunk
Revision: [1912]
Adding more work arounds for using plugins.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1913 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 03:46:27 +00:00
phpnut
36ccefa51f Merging fixes and enhancements into trunk
Revision: [1910]
Adding fix to correct paths when using plugins

Revision: [1909]
Adding a fix to load plugin AppController if AppController is not present in memory already

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1911 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-03 02:37:59 +00:00
phpnut
d284f74b10 Merging fixes and enhancements into trunk
Revision: [1907]
Fixed doc comment for loadPluginModels()

Revision: [1906]
Added function to load plugin models.
This will not attempt to load an AppModel used by a plugin.
More work is needed on work around for this.
A conflict with class names would be an issue.

Revision: [1905]
Adding component callbacks and RequestHandler component

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1908 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-02-02 23:01:23 +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
5dffcb6270 Merging fixes and enhancements into trunk
Revision: [1864]
Adding fix to DataSource::__cacheDescription().
The call to cache() was always passing $data as a serialized value, 
this would result in a failure in the cache function check $data == null 
since $data was not null but had a value of "N;".

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1865 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-27 03:24:40 +00:00
phpnut
b4f6dcc474 Merging fixes and enhancements into trunk
Revision: [1862]
Cleaning up scaffold views

Revision: [1861]
Added fix to scaffold when setting more than one 1 : 1 associations.

Revision: [1860]
Adding patch for Ticket #314

Revision: [1859]
Fixing Ticket #311

Revision: [1858] [1857]

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1863 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-25 22:40:17 +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
660259640d Merging fixes and enhancements into trunk
Revision: [1850]
Added fix for duplicate alias name being added to fields passed the the Model methods,
when a field already was aliased Example: Post.id will no longer return Post.Post.id.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1851 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-21 00:09:27 +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
c56189ac5c Merging fixes and enhancements into trunk
Revision: [1845]
Adding changes to DboSource::generateAssociationQuery and  DboSource::conditions() noted in Ticket #301. 


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1846 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-20 10:25:29 +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
35f20cb06e Merging fixes to trunk
Revision: [1831]
*Finally* fixing ACL.... again.  Are you all happy now?!?

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1832 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-18 05:35:14 +00:00
phpnut
3984795205 Merging fixes to trunk
Revision: [1829]
Fixing AjaxHelper::form()

Revision: [1828]
Added check to return false is passing an empty string to requestAction(),
method would seg fault if param was empty. 
Fixing another problem found when passing fields to the model methods.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1830 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-18 04:38:21 +00:00
phpnut
58e7bbc224 Adding fix to Test Suite.
Closes Ticket #279

Merging fixes to trunk

Revision: [1826]
Added fix for custom view classes

Revision: [1825]
Adding fix for Ticket #286

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1827 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 22:13:15 +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
ee6ccf15b6 Merging fixes to trunk
Revision: [1819]
Added fix for undefined index in Form::generateFields()
Adding missing doc blocks.
Adding fix for Ticket #290.
Added fix to allow setting fields for models.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1820 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 17:52:23 +00:00
phpnut
f718229a04 Merging fixes to trunk
Revision: [1817]
Adding fix from Ticket #287
Removing a change to DboSource::generateAssociationQuery()

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1818 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 05:30:08 +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
phpnut
6d17d0d608 Committed to wrong location
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1812 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 03:54:22 +00:00
phpnut
c56670c1e3 Adding a bootstrap file to remove need to edit index.php anymore
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1811 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-17 03:51:06 +00:00
phpnut
8a77108c44 Merging fixes to trunk
Revision: [1809]
Fixed self join code, may refactor after looking at it more. Currently it is working as expected.
Fixed errors in scaffold view caused by the changes I made.
Removed adding Child_ prefix to self joined associations.

Revision: [1808]
Adding changes I started on the self join code.

Revision: [1807]
Adding patch from Ticket #283.
Changed doc comment in SessionComponent class.
Added fix for Ticket #285 


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1810 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-16 21:34:46 +00:00
phpnut
44cd92d739 Merging fixes to trunk
Revision: [1805]
Adding fix for Ticket #238

Revision: [1804]
Fixing associations queries.
Adding fix from Ticket #275

Revision: [1803]
Removing the auto generating of a new session id when CAKE_SECURITY set to high.
Adding renew() to the session component, this can be used to regenerate a new session id.

Revision: [1802]
Adding fix for Ticket #280.
Need to decide if we should set the 2 vars mentioned in the ticket automatically,
I changed the 2 method to call the dbo. 

Revision: [1801]
Fixing errors in AclCLI class

Revision: [1800]
Made change to fields name setting, * will no longer be used, query will be built using the tables meta data

Revision: [1799]

Revision: [1798]
Adding fix for Ticket #269

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1806 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-15 12:18:57 +00:00