Fahad Ibnay Heylaal
679177b8f3
convenience wrapper for HTTP PATCH in HttpSocket class.
2013-06-04 22:46:15 +02:00
ADmad
3303a2cda1
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
lib/Cake/Console/Templates/skel/Config/acl.ini.php
lib/Cake/Console/Templates/skel/Config/acl.php
lib/Cake/Console/Templates/skel/Config/bootstrap.php
lib/Cake/Console/Templates/skel/Config/core.php
lib/Cake/Console/Templates/skel/Config/database.php.default
lib/Cake/Console/Templates/skel/Config/email.php.default
lib/Cake/Console/Templates/skel/Config/routes.php
lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
lib/Cake/Console/Templates/skel/Console/cake.bat
lib/Cake/Console/Templates/skel/Console/cake.php
lib/Cake/Console/Templates/skel/Controller/AppController.php
lib/Cake/Console/Templates/skel/Controller/PagesController.php
lib/Cake/Console/Templates/skel/Model/AppModel.php
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
lib/Cake/Console/Templates/skel/index.php
lib/Cake/Console/Templates/skel/webroot/index.php
lib/Cake/Console/Templates/skel/webroot/test.php
2013-06-02 18:03:59 +05:30
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
Jose Lorenzo Rodriguez
4bc92b822e
Adding App.fullbaseURL as a recognized Configure value
2013-05-30 16:07:26 +02:00
Sebastián Marcos Arce
fe774ecc03
Update HttpSocket.php
...
Add 'allow_self_signed' SSL context option.
2013-05-30 10:06:10 -03:00
ADmad
36c592e72e
Merge branch 'master' into 2.4
2013-05-26 11:23:53 +05:30
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
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
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
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
ADmad
fb86859585
Merge branch 'master' into 2.4
2013-05-19 14:37:41 +05:30
J Miller
987c01856a
Change variable name to be descriptive
2013-05-17 19:01:18 -07:00
TAKAHASHI Kunihiko
a562d9c04e
The assembly of the message was not correctly completed in specific Japanese.
2013-05-17 18:36:53 +09: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
mark_story
df872dde28
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/VERSION.txt
2013-05-10 21:58:48 -04: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
ADmad
a10275fb8b
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
2013-05-05 14:36:46 +05:30
Diego Massanti
255fe004eb
Patched CakeResponse's MapType() to increase performance by reducing hundreds of is_array() and is_string() system calls
2013-05-01 09:50:29 -03: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
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
ADmad
8135d405a3
Merge branch 'master' into 2.4
2013-04-27 18:39:30 +05:30
Mark Story
509b2b1e44
Merge pull request #1247 from DiegoMax/master
...
Added missing HTTP Status 505 to CakeResponse
2013-04-25 14:58:39 -07:00
Diego Massanti
a3d405524e
Added HTTP Status 505 (Unsupported Version) to CakeResponse
2013-04-25 17:59:28 -03:00
ADmad
06a5c509c0
Merge branch 'master' into 2.4
2013-04-21 19:15:55 +05:30
mark_story
3680ee0f1f
Add some docs for cookies.
2013-04-18 21:23:40 -04:00
mark_story
4d8dd12449
Add support for key => value cookies.
...
This makes using simple arrays easier, and I feel it is a long standing
omission from HttpSocket.
Fixes #3771
2013-04-18 21:22:50 -04:00
mark_story
ce04d6afa1
Add CakeRequest::isAll().
...
Provides a way to test multiple request types at the same time. And
assert that all pass. This replaces longer conditionals with a terser
syntax.
Refs #3714
2013-04-01 21:52:22 -04:00
mark_story
d4a3594e4f
Add support for is() with multiple types.
...
Add ability to check if a request is one of a set number of types
by providing an array. If any type matches, then the method returns
true.
Refs #3714
2013-04-01 21:52:15 -04:00
mark_story
3fc627c5f8
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Controller/Component/AuthComponent.php
lib/Cake/Error/ErrorHandler.php
lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
lib/Cake/View/Helper/HtmlHelper.php
2013-03-30 22:12:27 -04:00
Joel Bradshaw
ece6ac3663
Backwards compat for auth in the config array of HttpSocket::request()
...
Brings functionality back in line with docs as well
2013-03-29 15:46:42 -07:00
mark_story
041c2d289f
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Console/Shell.php
2013-03-26 20:31:54 -04:00
euromark
6002d6913d
correct doc block
2013-03-18 17:17:16 +01:00
mark_story
81dc4c1e85
Merge branch 'master' into 2.4
2013-03-13 20:30:25 -04:00
mark_story
cec4e8b758
Force & when creating requests.
...
Some people will have entities in arg_seperator.output. Make HttpSocket
more resiliant.
Fixes #3692
2013-03-13 20:22:58 -04:00
mark_story
8209097bc3
Merge branch 'master' into 2.4
2013-03-09 12:40:59 -05:00
Adam Taylor
433dd09ec4
Fix typos
2013-03-05 00:05:14 -07:00
mark_story
47526e8b4d
Refactor code to not use extract()/compact()
2013-03-01 22:34:00 -05:00
Jad Bitar
f1b815a9bb
Add scope to email logging.
2013-03-01 22:24:02 -05:00
mark_story
d1c88ebf8a
Merge branch 'master' into 2.4
...
Conflicts:
lib/Cake/Log/Engine/FileLog.php
lib/Cake/Utility/Validation.php
lib/Cake/View/Helper/HtmlHelper.php
2013-02-24 20:24:26 -05:00
euromark
111366d5c8
== to === and != to !== where applicable
2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc
Merge branch 'master' into 2.4
2013-02-09 02:20:16 +05:30
Graham Weldon
66d856d883
Added extra line for referencing license file for copyright
2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4
This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years.
...
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
2013-02-08 20:59:49 +09:00
mark_story
fb8c2a5e46
Make paths platform dependent.
...
This fixes issues with the built-in PHP webserver on windows.
Fixes #3608
2013-02-07 20:41:04 -05:00
mark_story
103bbbc375
Add CakeRequest::param()
...
This method gives a read accessor to the data in $request->params.
It removes the need to use isset() and empty().
2013-02-03 22:09:52 -05:00
mark_story
4af6039107
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Model/Model.php
2013-01-26 21:16:26 -05:00
mark_story
773666ddad
Fix coding standards and save a function call.
2013-01-17 20:34:25 -05:00
Mark Story
acc6a2645f
Merge pull request #1039 from bfanger/master
...
Fixes an issue with urls as GET parameters
2013-01-17 17:31:59 -08:00
mark_story
9c29fab4a4
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Network/Http/HttpResponse.php
2013-01-14 20:24:56 -05:00
U-Zyn Chua
bcdbdc8108
Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531
2013-01-15 09:17:24 +08:00
euromark
11a88042bd
fix doc block endings
2013-01-11 15:06:54 +01:00
ADmad
bacfa5a977
Fix missing controller error
2012-12-24 00:29:22 +05:30
Ceeram
3f4d24bfc0
remove unused local variables and a few improvements
2012-12-23 13:53:13 +01:00
euromark
b811afbc44
double spaces to single ones
2012-12-22 23:48:15 +01:00
Bob Fanger
b7b6859c27
Fixes corrupted CakeRequests when a $_GET value contains "://"
2012-12-21 16:12:51 +01:00
euromark
910e21e65e
a few more application contents should send the charset
...
adding content type tests as dataprovider
2012-12-21 12:32:32 +01:00
mark_story
554d5794ce
Merge branch 'master' into 2.3
2012-12-19 21:18:52 -05:00
mark_story
7ad11f59bb
Change line length in emails.
...
Use LINE_LENGTH_MUST instead of LINE_LENGTH_SHOULD. This
fixes a number of text wrapping issues caused by the narrower wrap
length.
Fixes #3151
Fixes #3473
2012-12-17 20:54:38 -05:00
mark_story
6f5ff4d7dd
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Model/CakeSchema.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
2012-12-13 20:20:42 -05:00
Ceeram
53b465d64e
do not pass 5th argument to mail() when in safe mode, even with a falsy value mail() will return false, fixes #3452
2012-12-13 18:22:45 +01:00
Ceeram
74836a1c30
ignore last few silencers for code sniffer
2012-12-10 17:57:22 +01:00
Ceeram
ec3e7afd75
Remove todo's whihc have been removed in e02eab05d5
...
and accidentally been re-added in 3e3af1f998
2012-12-10 17:06:06 +01:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
Ceeram
eadc3a75e5
fix coding standards
2012-11-21 15:39:03 +01:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
Mark Story
04d4abfa53
Merge pull request #965 from frederikweber/patch-1
...
Send charset in Content-Type when Content is JSON.
2012-11-19 17:08:57 -08:00
frederikweber
374dd55270
Changed else if to elseif.
2012-11-18 14:06:46 +01:00
frederikweber
9b479958f6
Send charset=UTF-8 if Content-Type is JSON.
2012-11-18 12:25:45 +01:00
frederikweber
ac0b9b285d
Send charset in Content-Type when Content is JSON.
2012-11-18 11:39:17 +01:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
euromark
b7e75a6399
more whitespace coding standards
2012-11-14 12:36:55 +01:00
mark_story
240c8718eb
Implement SSL peer verification in HttpSocket
...
Use the stream API and enable SSL certificate validation. This
increases the security features of HttpSocket, and provides easy access
to the stream context options. SSL related configuration should be
prefixed with 'ssl_'.
Refs #2270
2012-11-11 14:23:17 -05:00
mark_story
9e725641ad
Add context() to CakeSocket.
...
This will help enable peer verification for HttpSocket later on.
2012-11-10 22:58:36 -05:00
mark_story
3e3af1f998
Rename HttpResponse to HttpSocketResponse.
...
This fixes long standing issues with pecl/http
Fixes #2765
2012-11-10 22:36:38 -05:00
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
mark_story
8035b37df2
Only set $request->data with PUT/DELETE when it can be decoded.
...
Setting $request->data to the raw put data isn't overly useful unless it
can be decoded. Generally $request->data is expected to be an array,
when its a string things can go funny.
Fixes #3320
2012-10-31 21:02:47 -04:00
mark_story
b9ee4fc9f1
URL decode redirect urls.
...
Some servers send url encoded Location headers. Decode location headers
before processing a redirect.
Fixes #3310
2012-10-29 22:29:13 -04:00
mark_story
c24bec679b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/View/Helper/FormHelper.php
2012-10-27 21:13:53 -04:00
mark_story
528671f468
Replace Set with Hash.
2012-10-25 10:07:39 -04:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
mark_story
1aea9ac0c9
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Event/CakeEventManager.php
lib/Cake/VERSION.txt
lib/Cake/View/ViewBlock.php
2012-10-15 21:46:49 -04:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
59f84024e5
Handle REQUEST_URI with domain names properly.
...
Don't depend on parse_url() as it fails with corrupted urls. Instead
use FULL_BASE_URL to prepare an absolute path.
Fixes #3270
2012-10-14 11:58:07 -04:00
mark_story
1110e26483
Fix 0'th index file not being copied to $_FILES.
...
Fixes #3256
2012-10-11 08:39:46 -04:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
59e948fb1b
Merge branch 'master' into 2.3
2012-09-28 21:20:24 -04:00
mark_story
853d866c35
Remove port numbers from Message-id domains.
...
Fixes #3244
2012-09-28 21:20:14 -04:00
euromark
b47e3a7d92
move charset/App.encoding into CakeResponse
2012-09-27 20:28:19 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00