Commit graph

54 commits

Author SHA1 Message Date
DarkAngelBGE
fefbe77208 Minor refactorings for DboMysql, DboSource and TextHelper
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8241 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-21 20:57:39 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
mariano.iglesias
8da2a5208f Adding multibyte support to TextHelper::truncate, fixes #5610
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7842 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 00:07:17 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
mark_story
4355a13939 Altered TextHelper::truncate() when using exact = false and considerHtml = true close tags would be chopped off leaving incorrect Html. Closes #4941
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7342 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-16 12:40:49 +00:00
gwoo
1e231e9511 some cleanup, wrapping uses() in class exists
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7172 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-11 15:46:31 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
the_undefined
0053b162a8 Converted spaces to tabs
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6953 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 06:55:17 +00:00
the_undefined
3204ced2ed Made TextHelper::highlight utf8 compatible, fixes #4602
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6952 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 06:54:53 +00:00
joelmoss
64e68c9b7c Text helper highlight method now handles HTML tags correctly. Closes #2242
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6912 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-17 18:45:24 +00:00
the_undefined
93ad951a8c Fixed small bug in TextHelper::autoLinkUrls, closes #4357
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6832 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-13 03:53:26 +00:00
nate
81b57b7d5d Pushing TextHelper code coverage to 100%
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6816 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-12 07:05:33 +00:00
nate
66e1efbcdb Deprecating TextHelper::flay(), fixes #3052
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6815 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-12 06:46:58 +00:00
joelmoss
a0af56f923 Removing inline comments
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6712 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-23 13:58:26 +00:00
joelmoss
8fa2d1cf9c Added tests for TextHelper::truncate. Truncate now also fully respects HTML tags and characters if $considerHtml is passed and true. The third parameter of truncate can now also be an array consisting of any of the remaining params.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6711 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-23 13:23:12 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
phpnut
8a2b51c3ec "Removing all shortcut function usage from the core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
gwoo
072495f5e1 updating TextHelper::autoLinkUrls(), fixes #3597
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6043 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-11-22 05:36:20 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
160cd28440 Correcting @return int
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5858 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:11:12 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
phpnut
1704efa50a Fixes #3419, $text->autoLink does not preserve existing links
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5836 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-21 22:21:28 +00:00
mariano.iglesias
3eaa019625 Small typo
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5618 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-06 05:41:54 +00:00
mariano.iglesias
a798cd3dbb Adding some documentation tags. Fixing issue with stripLinks not properly removing multiple links. Making excerpt and autoLinkUrls case insensitive. Adding some tests.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5617 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-06 05:28:36 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
gwoo
624e02374a adding and to TextHelper::toList #1934
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5177 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-24 22:55:05 +00:00
dho
35c7807cc3 Case-insensitive matching when using array of phrases in TextHelper::highlight
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4878 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-21 16:55:09 +00:00
dho
ee403daf5d Fixing problem with highlighting multiple phrases (ticket #2418)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-13 14:27:59 +00:00
phpnut
a8a91e35be Correcting all headers in the files
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4407 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-02 10:39:45 +00:00
phpnut
1aef0e1f72 Adding fix for #1908
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4379 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-02-01 04:02:43 +00:00
phpnut
b36dc55327 Adding fix for #1953
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4359 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-31 21:05:51 +00:00
nate
18f086fbd1 Updating TextHelper::autoLinkEmails() with new API changes (Ticket #1874)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4266 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-01-06 21:10:33 +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
nate
de52eb88c9 Updating helper class hierarchy, and adding 1.2 fix for Ticket #1569
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3750 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-27 21:40:34 +00:00
nate
81679cc123 Adding fix for Ticket #1468
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3608 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-10-08 15:30:58 +00:00
nate
d783b537e5 Removing reference to HtmlHelper::linkOut in TextHelper::autoLinkUrls (Ticket #1468)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3592 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-28 23:54:06 +00:00
phpnut
6675bf9e62 Adding fix for #1302
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3492 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-15 00:36:35 +00:00
nate
39c32d0454 Adding default parameter for TextHelper::truncate
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3466 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-09-11 18:01:00 +00:00
nate
26977195c3 Fixing class name reference in TextHelper ('Html' -> 'HtmlHelper')
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3370 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-08-06 17:55:01 +00:00
nate
1dc6c1128b Adding TextHelper::toList(), to create natural-language lists from arrays
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3304 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 04:20:30 +00:00
nate
c50275de24 Cleaning up TextHelper code
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3303 3807eeeb-6ff5-0310-8944-8be069107fe0
2006-07-27 04:12:24 +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
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
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
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
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