Commit graph

4545 commits

Author SHA1 Message Date
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
mark_story
408aac4798 Update return types. 2013-05-21 15:45:22 -04:00
Gilles Wittenberg
6d996d52ce Allow setting different type on scriptStart + scriptEnd 2013-05-21 20:14:44 +02:00
Gilles Wittenberg
f19615a3be Allow setting different type on scriptBlock 2013-05-21 20:14:44 +02:00
Mark Story
28a3b73bdc Merge pull request #1292 from openam/HtmlHelper
make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false
2013-05-21 08:44:08 -07:00
Mark Story
e2304d8fd6 Merge pull request #1293 from kunit/2.3-cakeemail-wrap
Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST
2013-05-20 19:24:41 -07:00
mark_story
82d57fb8b2 Add mocked components to the enable list of components.
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.

Fixes #3842
2013-05-20 22:22:22 -04:00
mark_story
9cdc3927f2 Tidy up variable names.
Variables with _ in them are confusing, try to use clearer names.
2013-05-20 21:52:08 -04:00
TAKAHASHI Kunihiko
05473fe7d0 Processing was simplified when a length of one line was smaller than CakeEmail::LINE_LENGTH_MUST 2013-05-21 10:50:46 +09:00
Michael Tuttle
0d082b599a changed HtmlHelper::tag() just return $text when empty($name) 2013-05-20 17:36:51 -06:00
Mark Story
631082a2a4 Merge pull request #1284 from jmillerdesign/public-cakeemail-readfile
Utilize File utility to base64 encode email attachments
2013-05-20 08:19:39 -07:00
J Miller
b42a2d45e7 Remove readBase64() from File utility, since it is not commonly used. 2013-05-19 22:00:42 -07:00
Michael Tuttle
12462b2e51 make HtmlHelper::tag() just return the $text content with no wrapping tag when $name === false 2013-05-19 22:00:27 -06:00
mark_story
f8c6138ad7 Fix incorrect exception type when double slash paths are used.
Fixes #3838
2013-05-18 12:20:06 -04:00
J Miller
987c01856a Change variable name to be descriptive 2013-05-17 19:01:18 -07:00
mark_story
e23c4ffad9 Fix empty response bodies when redirect URL's are empty.
When redirecting XHR requests to an empty URL the response body should
not be overwritten.

Fixes #3835
2013-05-17 16:33:08 -04:00
Mark Story
9147f545fe Merge pull request #1286 from kunit/master
CakeEmail::_wrap does not operate correctly by the character string of specific Japanese.
2013-05-17 13:17:13 -07:00
J Miller
277ec8d89b Update link url to revised method name 2013-05-17 10:28:06 -07:00
J Miller
ea534002c3 Add to docblock the reason why the output is chunk_split 2013-05-17 08:44:46 -07:00
euromark
e1d6bb2120 code is not translatable and should not be part of the translation strings 2013-05-17 15:54:55 +02:00
TAKAHASHI Kunihiko
f541260350 Add TestCase for Network/Email/CakeEmail.php 2013-05-17 18:56:52 +09:00
TAKAHASHI Kunihiko
a562d9c04e The assembly of the message was not correctly completed in specific Japanese. 2013-05-17 18:36:53 +09:00
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
J Miller
4a4ca7c8d4 Make readBase64 an instance method
Leverage the existing code in File::read() and simply add in chunking and base64 encoding.
2013-05-16 18:56:46 -07:00
J Miller
dfdde954ea Create method readAndBase64Encode() in File utility.
Move this utility method out of CakeEmail, which allows other Mail transports to encode files manually. Maintains BC.
2013-05-16 13:20:59 -07:00
J Miller
f47609bd61 Allow readFile() in CakeEmail to be accessed publicly
I needed this method while building a Transport, and saw no reason why it needed to be protected.
2013-05-15 23:27:05 -07:00
euromark
9fd2af96a8 add test case 2013-05-14 10:38:10 +02:00
euromark
0822578813 $this->modelClass needs to be correct prior to the components init() call if the component itself accesses the model, lazyloading would try to load the wrong model otherwise 2013-05-14 10:17:57 +02:00
mark_story
f7d106a386 Fix FormHelper::tagIsInvalid with saveMany forms.
When saving multiple records validation errors were not correctly shown.
Fudge the entity path so it matches the validation errors set in the
models.

Fixes #3828
2013-05-13 21:09:31 -04:00
mark_story
bd3428e456 Remove Asset.x Configure values.
Having Asset.timestamp on can fail tests accidentally.
2013-05-13 21:09:31 -04:00
mark_story
c1b2ca581c Use terser assertions. 2013-05-13 21:09:31 -04:00
ADmad
4d434ec9f3 Fix CS errors 2013-05-13 23:51:32 +05:30
Jose Lorenzo Rodriguez
a079ca3f1c Update version number to 2.3.5 2013-05-11 02:56:56 +02:00
mark_story
6017db9dc8 Add missing urlencoding to base/webroot.
This fixes URL generation when PHP_SELF or the request path contains
special characters.
2013-05-10 11:04:46 -04:00
mark_story
f745a02210 Add missing html escaping.
This should have been here the whole time. Many of these variables could
contain user input.
2013-05-09 23:12:07 -04:00
mark_story
a49c69acc4 Add missing h() calls to exception stack traces. 2013-05-09 22:23:20 -04:00
mark_story
b533c1b3ba Make named capture groups compatible with older PCRE versions.
CentOS is terrible and generally contains very old versions of PCRE.
Update patterns to use more backwards compatible named capture groups.

Fixes #3821
2013-05-09 12:18:26 -04:00
Daniel Hofstetter
dae978fb3a Split sentence into two sentences 2013-05-09 10:22:43 +03:00
Pierre Martin
c6d8b477fc Prevent autoload when checking for the existence of HttpException
The class_exists check has been added in 4f29f58a5e (L1R28) to prevent a side effect with a PECL extension.

However if an autoloader such as the Composer one is loaded, it will try to require this `exceptions.php` file again:
```
    'HttpException' => $vendorDir . '/pear-pear.cakephp.org/CakePHP/Cake/Error/exceptions.php',
```
this will result in a "Fatal error:  Cannot redeclare class CakeBaseException"
2013-05-08 13:25:42 +03:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem
Fix bug in Xml::_toArray Method
2013-05-07 19:03:18 -07:00
mark_story
eee37bb04e Improve docs for AclShell. 2013-05-07 21:58:57 -04:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account
(when equal to zero) when passing an XML object to an array.
2013-05-08 00:56:17 +02:00
ADmad
91319bbe7b Fix disabled attribute check.
Fixes #3818
2013-05-08 01:43:27 +05:30
ADmad
372089797f Fix test 2013-05-07 23:23:07 +05:30
mark_story
06e7ba66c9 Update docs for Security::cipher()
This method is not cryptographically strong. Note that, and the
issues related to suhosin.

Related to #GH-1100
2013-05-06 23:03:20 -04:00
ADmad
43b77bc0b5 Move App::uses() calls above the class.
Improve docblock for Object::log().
2013-05-07 03:30:19 +05:30
ADmad
36a51bdad5 Avoid fail due to postgres ordering 2013-05-06 22:03:45 +05:30
Matt Creenan
3c46b8a491 Fix typo in link to cakephp book documentation 2013-05-06 13:00:06 -03:00
mark_story
4f179b01bd Make note of method removal. 2013-05-04 15:03:04 -04:00
Rik van der Heijden
dddf8aafb9 Fixed curly brackets at a few class definitions 2013-05-04 13:23:58 +02:00
ADmad
db26e24cb7 Remove error setting when reading/deleting non-existent key.
Fixes #3813
2013-05-04 03:16:33 +05:30
mark_story
3d682ba5e4 Update limit() in SQLServer to handle large page numbers as well. 2013-05-02 23:29:10 -04:00
mark_story
d4036310e4 Update limit() for Postgres
It should work like the parent class.
2013-05-02 23:27:26 -04:00
mark_story
00569ea405 Update limit() for Sqlite.
It should behave as the parent class does.
2013-05-02 23:25:13 -04:00
mark_story
7b0af659a9 Stop calling limit() twice on the same data.
DboSource::limit() now follows its documented input types, passing an
already formatted LIMIT string will result in LIMIT 0. Remove useless
array merging as well.
2013-05-02 23:12:38 -04:00
mark_story
2096d3f632 Clamp limit values to be unsigned integers.
This solves large page numbers potentially turning into scientific
notation when being formatted into queries. It also further safeguards
against SQL manipulation.

Refs #GH-1263
2013-05-02 22:36:50 -04:00
Rob McVey
bd3be2877d Test case for loooong page numbers in paginated results seems to cause SQL error 2013-05-02 09:57:04 +01:00
mark_story
df8f5e8f84 Add additional entropy to postLink()
This should help make more uniq id's for postLinks that are created
sequentially.

Fixes #3807
2013-05-01 09:46:57 -04:00
mark_story
41d124d4de Fix autoLinkUrls() not autolinking URL's without a /.
Refs #GH-1259
2013-04-30 17:02:07 -04:00
mark_story
b41051c8ab Also set mb_regex_encoding.
This fixes issues with corrupt bytes when you change the default
encoding and use regular expressions.

Fixes #3800
2013-04-30 13:00:36 -04:00
Mark Story
9b7cd0286f Merge pull request #1257 from dereuromark/master-form-helper-hour-fix
fix select hours for 0/12
2013-04-30 10:00:13 -07:00
mark_story
37ce6dfc81 Only allow sort fields that match the current object alias.
Instead of modifying aliases that do not match, only allow aliases that
do match.

Refs #3803
2013-04-30 12:41:42 -04:00
euromark
6b015d9771 fix select hours for 0/12 2013-04-30 14:54:09 +02:00
euromark
fab5a6f4d9 spelling corrections 2013-04-30 14:11:50 +02:00
Mark
faa6292f15 Merge pull request #1255 from dereuromark/master-copyright-noise-removed
Remove copyright noise from test files
2013-04-30 02:24:25 -07:00
mark_story
2b0e10eebb Exclude domain names starting with -
Related to 479aefc438

Refs #3414
2013-04-29 21:31:30 -04:00
Mark Story
ac94d11e65 Merge pull request #1254 from dereuromark/master-spelling-corrections
spelling corrections (a url to an URL, unify URL)
2013-04-29 09:27:48 -07:00
euromark
5b298c1306 remove copyright noise from test files to unify with new newer files which don't contain it anymore anyway 2013-04-29 17:16:53 +02:00
Mark
eb9b80e63a Merge pull request #1192 from dereuromark/master-templated-emails
fix line length for templated emails
2013-04-29 07:34:06 -07:00
euromark
ff0aa70b59 fix line length for templated emails 2013-04-29 16:18:00 +02:00
euromark
09d9efe235 spelling corrections (a url to an URL, unify URL) 2013-04-29 11:05:17 +02:00
Saleh Souzanchi
a48149b4db update doc of Router::redirect 2013-04-29 06:06:22 +04:30
Mark Story
619f66178b Merge pull request #1233 from spiliot/patch-1
Money validation should accept one decimal place.
2013-04-28 18:06:49 -07:00