Commit graph

88 commits

Author SHA1 Message Date
phpnut
ccfd962f98 Renaming core view templates with the new CakePHP extension .ctp
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3978 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-26 03:22:02 +00:00
gwoo
3bcf9e6044 fix for thtml custom missingView
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3976 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-26 00:10:59 +00:00
gwoo
9ad12b1f4e removed errant echo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3975 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-26 00:06:20 +00:00
gwoo
9e404b3ce3 refactor of view paths
refactor theme view paths
fix cleanUpFields error, changed ext in controller to ctp, fix for paginate conditions and scope

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3970 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 22:04:43 +00:00
gwoo
4320acdb96 1.2: continue refactor of view files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3969 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 21:27:34 +00:00
phpnut
76394b643f Refactoring loading plugin views and layouts.
Plugin templates can be overridden in the app/views/plugins/$plugin/$viewPath directory
If template is not found in this directory or the app/plugins/$plugin/views/$viewPath a missing 
view error will be rendered

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3966 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 19:58:16 +00:00
phpnut
e0096f0528 Fixing CacheHelper after removal of controller from View
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3962 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 09:27:13 +00:00
nate
41c79da1c3 Removing direct reference between View and helpers, and explicitly defining all Helper object properties
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3959 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 08:55:16 +00:00
nate
11d5b0fa7b Removing extra directory separators in uses() paths
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3953 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-25 04:31:26 +00:00
phpnut
54f770ae53 Refactoring fix for Ticket #1648
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3949 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-24 04:41:56 +00:00
phpnut
e42df60a24 Adding fix for Ticket #1648
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3948 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-24 03:53:44 +00:00
phpnut
984ceb3b51 Adding fix for Ticket #1629
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3935 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-23 10:06:49 +00:00
phpnut
22588729d4 Moving helper tags to specific helper classes
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3891 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 03:32:58 +00:00
phpnut
204ff6bcbb Refactoring Helper class and adding tags.php as a var.
Removing old /config/tags.php

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3890 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-22 03:16:34 +00:00
phpnut
f95285d75f Starting to change all core code that uses $this->params
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3859 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-12 00:12:34 +00:00
nate
99a420c8ef Refactoring code, adding error message to deprecated method (View::setLayout), and updating method references
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3858 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-11 21:05:00 +00:00
phpnut
d6b2545628 Adding fix for #1544.
Adds additional path searches for elements and layouts

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3786 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-11-01 06:51:57 +00:00
phpnut
54583f0afe Changing code in View::_loadHelpers() to use Inflector::variable()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3767 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-31 03:20:57 +00:00
gwoo
da2cf11ef3 1.2: pass the plugin name to renderElement
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3730 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-20 21:48:35 +00:00
nate
eea428e55d Code formatting and 1.2 interface updates
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3689 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-16 20:02:34 +00:00
phpnut
91ccb116eb Adding fix for #1281
View::renderCache() now removes the <!--cachetime:#--> from the output

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3493 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-15 02:13:21 +00:00
phpnut
e08a4a1da6 Merging changes for SessionHelper into 1.2.x.x branch
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3458 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-10 14:33:20 +00:00
nate
e812204ebc Moving model and field information into view
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3443 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-30 16:23:24 +00:00
nate
88079265b2 Adding $scripts_for_layout view variable, View::addScript(), and extra parameters to relevant HtmlHelper methods
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3438 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-28 20:41:08 +00:00
nate
8041562a76 Adding variable access convenience methods to View
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3423 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-22 07:32:59 +00:00
nate
6535c4936c Fixing code formatting in View
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3416 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-20 22:21:22 +00:00
nate
866ea4bd5e Adding automagic content-type-to-view-template mapping for use with Router::parseExtensions(). Also adding default XML template.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3411 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-18 08:05:00 +00:00
nate
1de5fee5bb Adding View::set(), allowing templates/elements to set variables for layout
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3396 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-12 01:18:28 +00:00
phpnut
3c8148924e Added layout to the cached view.
Added check in View::renderCache() for xml layout, if the layout is xml 
then correct header will be sent.
Before it would render text output


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3356 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-03 19:31:57 +00:00
nate
2b69e99ae3 Refactoring View and SecurityComponent
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3327 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-31 23:55:29 +00:00
phpnut
566f1b60b9 Fixing errors when trying to use plugin components.
Added Controller::_initComponents();
Changed helpers and components to allow using plugins helpers or 
components.
Syntax:
var $helpers = array('PluginName/HelperName');
var $components= array('PluginName/ComponentName');


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3315 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-29 17:08:23 +00:00
phpnut
0ae0905004 Adding fix for Ticket #1219.
Checking for an object being passed.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3306 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 17:13:02 +00:00
phpnut
08b8fca099 Removing bad character in last commit.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3206 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-06 13:45:13 +00:00
phpnut
3f2bc3ab82 Adding fix for PHP 5.2 errors.
The View::__construct() had a check for $controller != null;
Removing this fixed the errors related to not setting the vars from the controller instance.

Removed $this->parent =& $this->controller->parent; and $this->displayFields=&$this->controller->displayFields; which are not defined in the core Controller

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3204 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-06 13:04:21 +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
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
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
5f249cd10e Merged fix into trunk
Revision: [2371]
Fixed wrong variable name that stopped views overriding the core

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2372 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-19 05:03:42 +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
9f9c84de52 Merging fixes and enhancements into trunk Added fix for Ticket #492.
Revision: [2299]
Added fix for Ticket #494.
Added fix for Ticket #489.

Revision: [2298]
Fixed regex that would match more than one <cake:nocache></cake:nocache> group and cause a  wrong replace of the tags

Revision: [2297]
Corrected error in the convertSlash() function

Revision: [2296]
Another bug found and corrected after last commit.
This is working as expected now, and will be refactored.

Revision: [2295]
Fixed undefined index in CacheHelper::__parseFile();
Fixed caching when method is cached without params being set in the key

Revision: [2294]
Corrected caching for index method when accessing www.example.com/controller this would not use default index method.
Removed auto setting of the data variable in Controller::render();
Added additional check for cached index view in bootstrap.php

Revision: [2293]
Refactoring caching code.
Fixed problem with files being cached for all methods.
Added code to cache files to create helpers. 
Moved duplicate code to basics.php as a function

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2300 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 11:54:03 +00:00
phpnut
a5a96c9268 Revision: [2291]
Fixed error when using caching in PHP 4



git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2292 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 03:04:28 +00:00
phpnut
3f3ec6d42d Revision: [2289]
Removing unused var setting

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2290 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-14 02:32:58 +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
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
de46dc7fdc Merging fixes and enhancements into trunk.
Revision: [2275]
Change the way the cacheAction arrays can be set.

var $cacheAction = array('action/params/' => time); Multiple params are allowed, will only cache params level and deeper (action/params/params/)
var $cacheAction = array('action/' => time); Setting to just the method without any params will cache all request to that method.
var $cacheAction = string; Will set cache time for entire class.

Both settings can be used in the Controller::method().
$this->cacheAction = array() or string;

Revision: [2274]
Changed clearCache function to allow using url like param setting for cache.

Example:
One of the following can be used.
clearCache('controller'); Will remove all cached pages that have the controller name.
clearCache('controller/action/'); Will remove all cached pages that have the controller_action name.
clearCache('controller/action/params'); Will remove all cached pages that have the controller_action_params name. Note you can have multiple params
clearCache(array('controller/action/params','controller2/action/params)); You can also use and array to set more than one value, same setting as above apply to arrays.


git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2276 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 18:32:09 +00:00
phpnut
2572317443 Merging fixes and enhancements into trunk.
Revision: [2272]
Fixed missing view not rendering an error page when DEBUG > 0

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2273 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-03-12 15:59:46 +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