Commit graph

26 commits

Author SHA1 Message Date
phpnut
02df38c26f Renaming user_id to foreign_key in all ACL scripts
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3758 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-28 04:40:30 +00:00
nate
3a03674c76 Moving DataSource::getFieldValue to Set::extract
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3667 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-14 17:19:03 +00:00
nate
a0ee5743e5 Allowing user to specify database for ACL tables. (Ticket #1508)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3610 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-09 15:47:50 +00:00
nate
a184f16268 Adding delete() method for Aro/Aco models, thanks Andy (Ticket #1233)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3533 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-21 00:12:40 +00:00
phpnut
9d19dee879 Renaming branched version directory
git-svn-id: https://svn.cakephp.org/repo/branches/1.1.x.x@3085 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-06-14 18:02:37 +00:00
phpnut
e5c074a0dc Merging fixes into 1.x.x.x branched code:
Revision: [2955]

Revision: [2951]

Revision: [2918]

Revision: [2911]

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




git-svn-id: https://svn.cakephp.org/repo/branches/1.x.x.x@2805 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-05-09 02:15:47 +00:00
phpnut
e385b666dd Merging fixes into the trunk.
Revision: [2641]
Adding fix for file upload data

Revision: [2640]
Disabling Dispatcher access to controller callbacks

Revision: [2639]
Fixing output bug in AjaxHelper::link()

Revision: [2638]
Adding fix for Ticket #714 (The OC! [not the tv show])

Revision: [2637]
Additional refactoring of DB_ACL


git-svn-id: https://svn.cakephp.org/repo/trunk/cake/1.x.x.x@2642 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-29 21:51:30 +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
43e074acb0 Merging fixes and enhancements into trunk.
Revision: [2457]
Adding fix for Ticket #612

Revision: [2456]
"Enables use of Controller::$data in addition to Controller::$params['data']"

Revision: [2455]
"Adding fix for Ticket #634"

Revision: [2454]
"Removing trailing directory separator on ROOT"

Revision: [2451]
Dispatching and routing changes for IIS

Revision: [2450]
Downgrading error level in AclNode::create and adding additional filename check in listClasses()


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2462 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-04-06 00:06:02 +00:00
phpnut
87d703eaa5 Merging fixes and enhancements into trunk.
Revision: [2426]
Added patch from Ticket #566.

Revision: [2425]
Adding patch from Ticket #603.

Revision: [2424]
Adding fix for Ticket #604

Revision: [2423]
Adding fix for Ticket #601

Revision: [2422]
Refactoring ACL and updating queries

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

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

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

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

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

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

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

Revision: [2362]
Added fix for Ticket #534

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

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

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

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

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

Revision: [2356]
Reverting persistent changes to Model class

Revision: [2355]
Adding fix for Ticket #550

Revision: [2354]
Corrected errors in persistent code

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

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

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

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

Revision: [2349]
Adding fix for Ticket #548

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

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

Revision: [2346]
Adding fix for Ticket #527

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

Revision: [2344]
Last fix for Ticket #483 

Revision: [2343]
Updating last commit

Revision: [2342]
Adding fix for Ticket #483

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

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

Revision: [2339]
Adding patch from Ticket #544

Revision: [2338]
Adding patch from Ticket #529

Revision: [2337]
Adding patch from Ticket #528

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

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

Revision: [2334]
Added enhancement for Ticket #474

Revision: [2333]
Correcting errors introduced with prior fix

Revision: [2332]
Correcting errors introduced with prior fix

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

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


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

Revision: [2315]
Adding fix for Ticket #517

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

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

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

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

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

Revision: [2309]
Adding fix for Ticket #490

Revision: [2308]
Update to previous commit

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

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

Revision: [2305]
Reverting changes to this file

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

Revision: [2303]
Adding fix for Ticket #510


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2317 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-15 20:45:59 +00:00
phpnut
f9197dc7a5 Merging fixes and enhancements into trunk.
Revision: [2282]
Fixed caching of content when wrapped with the <cake:nocache> tags </cake:nocache>

Revision: [2281]
Fixing DBO compatibility in AclNode::_resolveID(), adding docblock and fixing code for stripslashes_deep(), and adding request detection helper methods to RequestHandler

Revision: [2280]
Added fix for empty pages being cached

Revision: [2279]
Fixed undefined index in CacheHelper::cache()

Revision: [2278]
Fixed bug in CacheHelper::__parseFile() regex pattern did not match properly

Revision: [2277]
Adding CacheHelper class.
Refactored View::_render() to use new CacheHelper.

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2283 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-13 03:48: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
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
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
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
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
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
phpnut
9560f78884 Merging:
Revision: [1638]
removing php short tags

Revision: [1637]
Remove renderElememnts loading of helpers also, forgot it in the last commit

Revision: [1636]
Refactoring after profiling code.
Session was creating a new instance of Dispatcher removed the need for it.
Added a check to the Component class to pass the base to the SessionComponent class, will refactor that at a later time.

Changed View class so it would not load helpers when rending a layout, no need for that.
A great performance boost after the change.

Change the loadModels method call in app/webroot/index.php.
Will only attempt the loadModels call if the AppModel class is not in memory, and the Database class is in memory.
Removed all unnecessary calls to basics uses(). Again another big performance increase.
Added fix to the Html::guiListTree() after discussing the output that is expected.
A ticket was closed on this already.

Revision: [1635]
Removing calls to basic uses()

Revision: [1634]
Removing calls to basics uses() that are not needed.

Revision: [1633]
Removing calls to basics uses() that are not needed.
Moved Object class further up in the loading order

Revision: [1632]
adding fix for Ticket #132

Revision: [1631]
Added fix from Ticket #122

Revision: [1630]
Scaffold views can now be placed in a view directory.
These will override the core.
Example (Must have the scaffold dot name):
app/views/posts/scaffold.list.thtml
app/views/posts/scaffold.new.thtml
app/views/posts/scaffold.edit.thtml
app/views/posts/scaffold.show.thtml

Revision: [1629]
Think I fixed the issue with scaffold showing proper dates prior to January 1 1970 00:00:00.

Revision: [1628]
Added a few more change to allow saving dates prior to January 1 1970 00:00:00.
Still a few issues with this, but will get them figured out soon.
Changed scaffold to use only one form view.

Revision: [1627]
Added fix for Ticket #189

Revision: [1626]
Added fix for Ticket #120.

Revision: [1625]
left justified doc blocks

Revision: [1624]
remove files from uses() that are loaded by default in app/webroot/index.php no reason to attempt to load them again in the classes

Revision: [1623]
adding check to the loadModels and loadController that will only attempt to load files if the classes are not already in memory

Revision: [1622]
Adding fix to time helper that was lost in a previous merge
Removing all tabs from code

Revision: [1621]
Addtional model validation fixes

Revision: [1620]
fixed parse error

Revision: [1619]
Fixing ticket #102

Revision: [1618]
correcting mime types and keywords

Revision: [1617]
correcting mime types and keywords

Revision: [1616]
fixed link in footer

Revision: [1615]
Fixing ticket #207

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1639 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-27 03:33:44 +00:00
phpnut
c7d02c8068 Merging changes to the trunk.
Updated headers.
beginning to clean up files that are not used in this version of Cake

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1593 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-23 21:57:26 +00:00
phpnut
217923eaec Merging changes into trunk
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1567 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-22 01:17:03 +00:00
phpnut
526e1ac450 Merging changes into trunk
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1565 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-12-22 01:07:28 +00:00
phpnut
b50276f976 [1328]
Author: phpnut
Date: 10:02:08 PM, Friday, November 04, 2005
Message:
Merging new ACL

[1312]
Author: phpnut
Date: 8:20:15 AM, Wednesday, November 02, 2005
Message:
More coding on the Security class.
Added cipher method provided by Nate to the class.
Added hash method that will be used to generate a authentication key
Added method to the CakeSession class to return all session vars if the session components read method is called with empty params.




git-svn-id: https://svn.cakephp.org/repo/trunk/cake@1329 3807eeeb-6ff5-0310-8944-8be069107fe0
2005-11-05 04:08:14 +00:00