Commit graph

425 commits

Author SHA1 Message Date
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
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
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
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
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
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
phpnut
d0b9721473 Merging fixes to trunk
Revision: [1786]
Little more cleaning up of the code

Revision: [1785]
Deleting old dbo files

Revision: [1784]
Adding [1780] fix lost in [1782]

Revision: [1783]
Added patch from Ticket #267.
Removed all debug output in the error views, this is moved to one error element that is loaded in View::renderLayout() if  DEBUG > 2.
Added fix to Ajax::dropRemote().

Revision: [1782]
Added controller dump view when DEBUG is set greater than 2

Revision: [1781]
Adding elements directory to the core

Revision: [1780]
Adding this to close Ticket #265

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1787 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-13 05:56:04 +00:00
phpnut
7eb2555405 Merging fixes to trunk
Revision: [1778]
Fixing a few more bugs in the model code

Revision: [1777]
Fixes to Model::save() that allows saving a new record when primary key is not auto generated in database.
Added the DboSource::hasAny() back to the code.





git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1779 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 22:06:11 +00:00
phpnut
83d00fc93a Merging fixes to trunk
Revision: [1775]
Fixed error in hasOne associations


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1776 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 18:34:16 +00:00
phpnut
dd3de20200 Merging fixes to trunk
Revision: [1773]
adding fixes to PHP 5 model class

Revision: [1772]
Fixed errors in PHP model.
Fixed parse error in CakeSession Class.
Added stripslashes_deep function to basics.php
Fixed errors in Dispatcher class.

Revision: [1771]
reverting changes in last commit

Revision: [1770]
Fixing save() in model

Revision: [1769]
correcting more errors that we are finding

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1774 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 16:55:46 +00:00
phpnut
3a971927d4 Merging changes into trunk
Revision: [1764]
Changed var $ds back to $db and var $source back to $table in beta.
Moved last error message out of the object class.                
Fixed PHP 4 error in home.thtml.

Revision: [1763]
Added changes made in model error handling lost in merge



git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1765 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 03:56:59 +00:00
phpnut
677a39a445 Merging changes to trunk:
Revision: [1761]
Removing old db_acl.sql

Revision: [1759]
Removed unneeded calls to uses().
Changed basics.php listClasses() no longer using folder class.
Starting corrections in  DboPostgres class.
Adding missing DboPostgres::query().
Added missing doc blocks to AjaxHelper.
Fixed undefined keys in FormHelper::generateFields()
Reformatted FormHelper::generateFields() adding open and close brackets where needed

Revision: [1758]
Fixed typo

Revision: [1757]
Fixed errors found when using PHP 4.
Fixed a scaffold error

Revision: [1756]
Merging changes to model_php4.php

Revision: [1755]
Fixed scaffolding for the changes made to the model.
Fixed Model::isForeignKey(), replaced array_key_exists with in_array, other function was failing

Revision: [1754]
Committing changes from bundt model to beta.
DataSources will not be in the beta release

Revision: [1751]
Cleaning up a little more in the code.
Removing loading of log.php unless it is really needed.
Refactored dispatcher to speed up the stripslashes code if it is called

Revision: [1748]
removing all references to error_messages and deleting the file

Revision: [1747]
updated more error messages

Revision: [1746]
removing all error message defines

Revision: [1745]
added _() method from 1.0 to basics.php only used to return string right now

Revision: [1744]
Adding fix for ticket #220

Revision: [1743]
More work on ErrorHandler class

Revision: [1742]
Renaming error view for missing database connection

Revision: [1741]
More work on ErrorHandler class

Revision: [1740]
More work on error class

Revision: [1739]
Replacing all $_SERVER variable check with env() in basics.php

Revision: [1738]
Adding env() to basic

Revision: [1737]
Updated session to use env()

Revision: [1736]
Removing ternary operators from Dispatcher

Revision: [1735]
Per nates request I am rolling back ACL to [1373]

Revision: [1734]
Removed the IP in the session class this was not very reliable.
Added a time setting that generates current time adding the Security::inactiveMins() to the session
Removed code that was added to basics.php to replace gethostbyaddr().
Added CAKE_SESSION_STRING define to core.php which is used in the by the Session class to generate a hashed key.

Revision: [1733]
Moving errors messages to ErrorHandler class.
Updating errors view for use with new class.
Updating Scaffold to use new class.
Updated Dispatcher to use new class.
Removing methods from Object class

Revision: [1732]
Adding ErrorHandler class

Revision: [1731]
Adding fix for Ticket #223


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1762 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-01-12 02:10:47 +00:00