Commit graph

4617 commits

Author SHA1 Message Date
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
Jose Lorenzo Rodriguez
58149f2315 Backporting from 2.4 fix for booleans in mysql when running PHP 5.5 2013-07-02 16:51:29 -04:30
Marc Würth
ff1f80349a Removed superfluous break
In every case of the if clause it will return, so break is not needed.
2013-07-02 21:00:24 +02:00
euromark
c671d8da62 use strict comparison for strings 2013-07-02 11:01:02 +02:00
mark_story
2f57a7fb18 Use simpler and faster code.
substr_compare() is up to 2x slower than just substr(). Use a faster,
more common, and simpler to read variant of the same thing.
2013-07-01 23:06:56 -04:00
mark_story
521c293eb1 Fix coding standards. 2013-07-01 22:56:00 -04:00
Mark Story
9a08aeafcf Merge pull request #1377 from ravage84/fix-for-3318
Trim off webroot/index.php when determining base and url.

Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it.

Fixes #3318
2013-07-01 19:51:34 -07:00
mark_story
9754789b69 Don't load classnames with .. in their names.
Classnames with . in them are invalid and can be leveraged to load code
outside of an application by traversing directories.
2013-07-01 21:21:20 -04:00
Mark Story
da033cbed7 Merge pull request #1375 from dereuromark/master-cake-email
Move boundary calculation inside _render()
2013-07-01 06:12:24 -07:00
Mischa ter Smitten
dad1f16eaf Made _stop() usage in Consoles / Tasks more consistent 2013-07-01 14:15:54 +02:00
Marc Würth
e84bf65016 Typo in FormAuthenticate.php 2013-07-01 00:03:03 +02:00
Marc Würth
f930a50805 Fix for #3318
Fixes https://cakephp.lighthouseapp.com/projects/42648-cakephp/tickets/3318

It seems fixing this in the htaccess file(s) isn't going to work even though a url rewriting based solution was more clean. On the plus side this works for any web server.
If a url is called with "index.php" in it then the CakeRequest swallows this part and fixes the path. Any linked url from the requested page will have a clean url. Thus after following one of these urls this problem is gone anyway.

Some code docblock improvements to CakeRequestTest.php
Added test case for fix
Also now you can call just index.php even if you have url rewriting enabled
2013-06-30 05:38:58 +02:00
mark_story
1d18a4f702 Fix issue where redirectURLs were not generated correctly.
When the first path segment matches the base path an incorrect URL was
generated. Trimming slashes off makes Router normalize the URL correctly
as the leading / implies that the base is already prepended.

Fixes #3897
2013-06-29 23:26:13 -04:00
mark_story
0d76bfe325 Add an additional test for CakeRequest::referer().
Trying to track down the issue for #3897. This test coverage was
missing, so fix that.
2013-06-29 23:26:13 -04:00
euromark
c94fe1b729 also move protected variable resetting into the correct scope 2013-06-29 16:23:55 +02:00
euromark
b346c4af8e Test to proof that render itself should handle the boundary. 2013-06-29 15:16:58 +02:00
Mark Story
b73f927787 Merge pull request #1381 from ravage84/patch-1
Annotated testReconnect
2013-06-27 14:59:29 -07:00
Marc Würth
aabeaada0f Fixed @return statement in DboSource::disconnect 2013-06-27 17:38:46 +02:00
Marc Würth
9591f55394 Annotated testReconnect 2013-06-27 17:15:56 +02:00
Marc Würth
070a6f0ad5 Added a related cookbook link to DataSource.php 2013-06-26 22:07:52 +02:00
euromark
0ca1ba3211 allow callbacks to modify attachements by moving the decision to calculate boundary value into the correct position inside _render() 2013-06-26 02:20:31 +02:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
2013-06-25 22:58:30 +02:00
euromark
ee5e8c95dd fix issue with FormHelper and undefined variable and extract 2013-06-25 12:11:10 +02:00
euromark
290c343a74 tests to disprove that input date and partial dateFormat does not work 2013-06-25 11:54:29 +02:00
Werner Pieterson
9383236114 Formatted code
Formatted code to conform to style guide
2013-06-23 19:49:17 +02:00
Werner Pieterson
b172d6e254 Fixed "delete" translation string bug 2013-06-23 18:10:29 +02:00
ADmad
3e8a7f5e66 Make ScaffoldView extend View instead of deprecated ThemeView 2013-06-22 22:05:31 +05:30
mark_story
94815a74f1 Add ordering to prevent occasional pgsql failures. 2013-06-21 17:47:08 -04:00
Marc Würth
2418ea0a57 Fixed typo in AuthComponent::redirectUrl 2013-06-21 16:49:31 +02:00
mark_story
68db74d32d Cleanup from previous commit.
Refs #GH-1352
2013-06-19 15:06:51 -04:00
Lucas Machado
dc3f9113b0 Fix to the date input year field
Create the field if no value is informed only to the maxYear and not to
the current date.
2013-06-19 15:05:15 -04:00
Mark Story
691288accc Merge pull request #1362 from dereuromark/master-cake-session
cake session clarification
2013-06-18 15:05:00 -07:00
euromark
1b1943954b CakeSession improvements 2013-06-18 23:49:42 +02:00
euromark
eb13242680 assert proper array access for _dateTimeSelected() 2013-06-18 09:39:43 +02:00
mark_story
111bfa43d4 Fix incorrect autolinking when urls end at HTML tags.
Fixes #3879
2013-06-15 22:01:29 -04:00
mark_story
fe809cd85d Remove undocumented magic features for IIS.
Undocumented, untested features break very easily. It is best to not
have them where possible.
2013-06-13 18:01:11 -04:00
euromark
4671f235ad duplicate line removed 2013-06-13 14:15:00 +02:00
José Lorenzo Rodríguez
2f93d781ad Merge pull request #1349 from renansaddam/smtpTransportReturnPath
Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport
2013-06-13 05:05:36 -07:00
mark_story
e2d69402e7 Remove dead view cache code.
Now that cache files contain the response headers, this is no longer
needed. Remove what is now duplicate code.

Refs #2358
2013-06-12 21:30:42 -04:00
Mark Story
e454f2d2a3 Merge pull request #1334 from thegallagher/2.3-cache-fix
Fix content-type header in cached views.

Fixes #2358
2013-06-12 18:27:42 -07:00
Mark Story
57d8c6b412 Merge pull request #1350 from dereuromark/master-post-link-doc-block
doc block formhelper postLink
2013-06-12 09:37:08 -07:00
euromark
b5b8885096 doc block formhelper postLink 2013-06-12 18:14:02 +02:00
Mark Story
d52c401ff2 Merge pull request #1348 from thomseddon/consistent-timestamps
Unify modified/created times. Both the created/updated timestamps will reflect the same point in time now.
2013-06-12 07:13:48 -07:00
Thom Seddon
305b3f4688 Unify modified/created times
The former implementation meant that it was not guarantee that
the times automatically generated for the modified/created fields
would be exactly the same for a given operation.
2013-06-12 13:51:56 +01:00
Renan Gonçalves
796e4b45dd Using Return-Path email address in MAIL FROM instead of a header in SmtpTransport.
The Return-Path header should not be present on the SMTP transaction, this header is set by the time of final delivery.
Quote RFC2821:
> When the delivery SMTP server makes the "final delivery" of a message, it inserts a return-path line at the beginning of the mail data. This use of return-path is required; mail systems MUST support it. The return-path line preserves the information in the from the MAIL command.
2013-06-12 11:31:49 +02:00
Rik van der Heijden
e7d2892e81 Fixed unit-test locales 2013-06-11 20:18:40 +02:00
Frank de Graaf
f79a258a64 Minor optimization of CakeEmail::_wrap(). 2013-06-11 00:53:25 +03:00
Mark Story
e77d49f554 Merge pull request #1342 from dereuromark/master-coding-standards
incorrect tab to space - whitespace coding standards
2013-06-09 20:00:46 -07:00
mark_story
d10df32a44 Update version number to 2.3.6 2013-06-09 22:41:41 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
euromark
f6aedea271 coding standards elseif 2013-06-09 17:12:46 +02:00
mark_story
e5b1182a0d Only delete files that have a matching group + prefix.
Fixes #3873
2013-06-08 22:42:41 -04:00
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an array to XML object.
2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38 Merge pull request #1336 from djbobke/caketimetest-locale
Fix locale for CakeTimeTest when configured different locale in app
2013-06-08 06:45:20 -07:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
Arnold Almeida
dacf7e0ebe Update FixtureTask.php
Using err() does not stop shell output when used in the context of a script. 

Also no nice color syntax to indicate that there was an error with one of the fixture generations.

Using error() fixes that.
2013-06-07 14:21:35 +08:00
Jose Lorenzo Rodriguez
f14c55916f Repeating previous change for SQLite, so it passes on PHP 5.5 2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6 Fixing postgres test for PHP 5.5 2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2 Rewriting assertion to account for the actual case and not breaking in
PHP 5.5
2013-06-06 17:45:52 +02:00
David Gallagher
e222b3b78e Remove trailing space 2013-06-07 01:01:33 +10:00
David Gallagher
0ada093295 Set content-type to xml to replicate existing behaviour 2013-06-07 00:28:28 +10:00
David Gallagher
0eead76d4b Fix content-type header in cached views. Fixes issue #2358 2013-06-06 23:33:51 +10:00
Mark Story
e26a05ce04 Merge pull request #1235 from ADmad/2.3-caketime
Fix datetime comparison in relative datetime functions.
2013-06-05 06:12:50 -07:00
Kim Egede Jakobsen
6c3a63ea9b Correct small typos. 2013-06-05 09:57:18 +02:00
mark_story
3aa189eb3a Fix cookie expiry time calculation on 32bit systems.
strtotime() misbehaves on 32bit systems when the resulting timestamp
would overflow an integer. Use a DateTime to workaround this issue.

Fixes #3868
2013-06-03 20:16:18 -04:00
mark_story
027cfe9496 Fix typo. 2013-06-02 18:12:51 -04:00
mark_story
cbf3228c34 Fix inconsistent name/alias usage.
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
2013-06-02 13:50:23 -04:00
Saleh Souzanchi
ca44413689 fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options 2013-06-01 14:16:23 +04:30
mark_story
be2a252345 Fix coding standards. 2013-05-31 10:37:20 -04:00
Mark Story
4b7c128f04 Merge pull request #1320 from ravage84/docblock-improvements
Improved the DocBlocks and other code cleanup
2013-05-31 07:36:04 -07:00
Mark
525bf3b362 Merge pull request #1297 from dereuromark/master-email-wrapping
enforce a better email wrapping to send valid emails
2013-05-31 07:30:32 -07:00
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
2013-05-31 00:11:19 +02:00
Marc Würth
2bbd391972 Synced PHP version annotations
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
2013-05-29 20:19:14 +02:00
Mark Story
bed60b5d82 Merge pull request #1312 from ravage84/package-fixes
Fixed or removed some package/subpackage definitions to reflect director...
2013-05-29 10:14:00 -07:00
Marc Würth
e7eb09bc23 Renamed ...Controller package to ...View
Probably a leftover from splitting in 09e7f1d491
2013-05-29 17:20:41 +03:00
Marc Würth
29cc6b3652 Fixed or removed some package/subpackage definitions to reflect directory structure
Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
2013-05-29 15:00:18 +02:00
Damien Biasotto
e1c27af9e9 Fix typo variable name in _deleteDependent().
It's not a big deal but there was a typo in _deleteDependent() method. 

$savedAssociatons instead of $savedAssociations.
2013-05-29 14:25:39 +03:00
Ceeram
49aded5399 fix coding standard error 2013-05-28 18:39:38 +02:00
euromark
bebb8ec416 do not translate error message in test case 2013-05-28 03:25:52 +02:00
mark_story
7334643b55 Fix issues with getting Xml as SimpleXmlElement and invalid Xml.
Fixes #3855
2013-05-27 13:22:14 -04:00
mark_story
41e0c524f2 Only try to use CakeErrorController if AppController exists.
This fixes missing error pages when there are parse errors in
AppController.

Fixes #3850
2013-05-26 22:11:53 -04:00
Mischa ter Smitten
c0039f642e Output to stderr, not stdout 2013-05-25 23:19:31 +02:00
Mischa ter Smitten
caec0abcfc Fix for ExtractTask does not check output directory (ticket 3852) 2013-05-25 22:32:07 +02:00
mark_story
9ee610757e Throw exceptions when invalid permission keys are used.
Silently 'failing' to save permissions is bad, throw exceptions instead.

Fixes #3851
2013-05-24 21:47:22 -04:00
Rachman Chavik
a63b54c34b Fix: Incorrect model being used as Controller::$modelClass
We cannot be sure that Controller::$uses have not been iterated, so
reset the array to use the first value.
2013-05-24 17:50:43 +07:00
euromark
75b5a323e4 enforce a better email wrapping to send valid emails 2013-05-23 18:34:39 +02:00
mark_story
ca1f9e800e Make CakeEmail::config() merge configuration.
This allows you to incremementally overwrite configuration and better
matches other config methods in CakePHP.

Fixes #3848
2013-05-23 09:47:24 -04:00
mark_story
85a906c0fc Expand doc blocks. 2013-05-23 09:45:50 -04:00
ADmad
11e428bca3 Fix docblock 2013-05-23 01:02:07 +05:30
Mark Story
074b21591c Merge pull request #1294 from ADmad/2.3-bugfix-smtp
Ensure passing empty array to SmtpTransport::config() does not reset exi...
2013-05-22 06:21:07 -07:00
Mark Story
085ebae1d3 Merge pull request #1295 from cakephp/master-i18n-fixes
Master i18n fixes
2013-05-22 06:20:04 -07:00
euromark
fa02a2efc9 unify "Are you sure you want to delete" 2013-05-22 12:15:33 +02:00
euromark
e3e11a48e6 fix some domain translations and remove leftover true param from 1.x 2013-05-22 11:15:01 +02:00
ADmad
eccdf3bf60 Ensure passing empty array to SmtpTransport::config() does not reset existing config.
Synced args and return value with AbstractTransport::config().

Fixes #3840
2013-05-22 11:36:31 +05:30
Mark Story
1357b00843 Merge pull request #1289 from gilleswittenberg/master
Allow setting type attribute on script block tags
2013-05-21 13:27:35 -07:00