Commit graph

285 commits

Author SHA1 Message Date
Ceeram
7eda0affe3 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/View/ThemeView.php
2012-01-26 21:40:18 +01:00
mark_story
f02a3b0531 Wrap aliases containing , in ""
Fixes #2502
2012-01-25 21:03:03 -05:00
Jose Lorenzo Rodriguez
a1daaf5960 Merge branch '2.1-http' into 2.1 2012-01-21 15:51:34 -04:30
mark_story
df5d9ac3d1 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Routing/RouterTest.php
2012-01-20 20:28:15 -05:00
mark_story
e6f5ebc257 Merge changes from hmic/CakeEmail-2.0
Adds parameters for file attachments instead of having
boundary prefixes in multiple places.

Fixes #GH433
2012-01-20 20:17:02 -05:00
Jose Lorenzo Rodriguez
00a5510b1d Readability changes 2012-01-19 22:26:59 -04:30
Jose Lorenzo Rodriguez
979f7a28b5 Fixing a couple bugs in CakeResponse::checkNotModified() and implementing conditional rendering in
RequestHandlerComponent
2012-01-19 01:08:45 -04:30
Jose Lorenzo Rodriguez
b79e0ad8f3 Moving checkModified() to CakeResponse, having it in the RequestHandler has too restrivtive 2012-01-19 01:08:45 -04:30
José Lorenzo Rodríguez
6839f0c450 Fixing typo in docblock 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
8e979cc83e Implementing CakeResponse::notModified() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
dbd097debb Implementing the CakeResponse::etag() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
803d49c7c6 Adding CakeResponse::vary() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
3240f6221e Implementing mustRevaidate() 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
552c70a571 Removing Pragma headers, implementing sharedMaxAge in CakeResponse 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
d9987c96db Implementing sharable() and maxAge() in CakeResponse for a finer grain and easier control of cache headers 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
130b827e6f Implementing the modified() method in CakeResponse to have an easier way of setting the modification time 2012-01-19 01:08:44 -04:30
Jose Lorenzo Rodriguez
bab7e772d2 Adding expires() to CakeResponse to help adding expiration dates to the http response cache directives 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
f32c703e7e Not appending the charset information for content types that are not text/* in CakeResponse 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
4d19d536f6 Saving a few bytes by unsetting the content if the response status code is 204 (No Content) or 304 (Not Modified) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
5b42cb8130 Adding length() method to CakeResponse as a shortcut for Content-Length. If you wish to force not Content-Length use length(false) 2012-01-19 01:08:43 -04:30
Jose Lorenzo Rodriguez
336ba1965e Adding protocol() method to CakeResponse to be able to change it on the fly 2012-01-19 01:08:43 -04:30
mark_story
97ce118294 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Utility/ClassRegistry.php
2012-01-11 20:59:31 -05:00
mark_story
4d73f4e6a1 Fix boundaries used in multi-part messages.
Inline attachments should use the multipart/related boundary.  Otherwise
sections will be incorrectly nested.

Fixes #2413
2012-01-11 20:44:42 -05:00
Hans-Joachim Michl
29cfdb4b41 Fixed wrong boundary marker for inline-files, inline-files should start new rel-boundaries, not (outer-)mixed-boundaries.
Amavis spits out this error:
X-Amavis-Alert: BAD HEADER MIME error: error: unexpected end of parts before epilogue
2012-01-11 20:30:49 -05:00
mark_story
dbea15650b Add iPad to the list of mobile clients.
Fixes #2452
2012-01-09 21:33:13 -05:00
mark_story
15c7493e39 Merge branch '2.0' into 2.1 2012-01-06 23:02:16 -05:00
mark_story
95ec741b6c Changing SCRIPT_NAME to PHP_SELF
Several shared hosts have issues with SCRIPT_NAME having an incorrect value.
Revert back to using PHP_SELF like in 1.3.

Fixes #2437
Fixes #2334
Fixes #2268
2012-01-04 21:10:29 -05:00
mark_story
997aa8a37b I'm an idiot. Fix the parse error. 2012-01-01 21:29:13 -05:00
mark_story
83987bee17 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Network/CakeRequest.php
2012-01-01 21:15:27 -05:00
mark_story
ac408b38e3 Add Windows Phone OS to mobile browser list.
Fixes #2428
2012-01-01 12:57:35 -05:00
mark_story
23178df504 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper/FormHelper.php
2011-12-29 20:03:42 -05:00
Mark Story
83b28c42cf Fix failing tests and missing boundary markers.
When sending html + text emails, there were duplicate multipart/alternative sections
and the trailing top level boundary was missing.
2011-12-27 23:38:21 -05:00
Mark Story
0e4af546d6 Update sending attachments.
Both inline and external attachments, as well as mixed sets of
inline and external attachments should work now.  Re-built the internals
of message rendering to remove duplication and redundant code paths.

Fixes #2413
Fixes #2320
2011-12-27 22:51:47 -05:00
Mark Story
53598c722c Pulling out view rendering from boundary setting. 2011-12-27 22:51:47 -05:00
Mark Story
8414d37e48 Add docblock examples for attachments. 2011-12-27 22:51:47 -05:00
ADmad
389072708a Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
2011-12-11 22:51:40 -05:00
mark_story
b7f6645cec Fix issue with url parsing and /?
PHP's parse_url fails to parse url's containing
`/?`.  It returns false instead of something useful.

Fixes #2354
2011-12-08 21:48:40 -05:00
Kyle Robinson Young
c836ba08a3 Add/move docblocks to make text available in the API docs 2011-12-08 07:35:02 -08:00
euromark
be770bd9b8 Typo fix in HttpSocket
`schema` should be `scheme`, this fixes the only use of
schema in HttpSocket.

Fixes #2345

Signed-off-by: mark_story <mark@mark-story.com>
2011-12-06 21:07:12 -05:00
mark_story
1bc3583133 Add usage to HttpSocket::configAuth()
Fixes #2336
2011-12-04 13:45:53 -05:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
mark_story
22352a0227 Fix missing directory in dispatcher with rewrite off.
When re-writing is disabled, and the deployment directory
contains either 'app' or 'webroot' the computed path was
incorrect.

Fixes #2330
2011-12-02 23:39:33 -05:00
Kyle Robinson Young
8197f87dbc Spelling and grammar fixes 2011-12-01 21:58:09 -08:00
mark_story
390db7beba Fix issue with dots in request URLs.
Dots in request url's often resulted in an additional get parameter
being added.

Fixes #2303
2011-11-26 21:24:53 -05:00
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
2011-11-16 21:31:16 -05:00
mark_story
9c5ad71abc Add CakeRequest::__isset()
Fixes #2266
2011-11-16 20:21:07 -05:00
mark_story
542e5c91de Merge branch '2.1' of github.com:cakephp/cakephp into 2.1 2011-11-15 23:11:07 -05:00
mark_story
fb7d931bef Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-15 23:10:34 -05:00
Renan Gonçalves aka renan.saddam
1db915faec Merge pull request #314 from challet/HttpSocket_handle_redirect
move 'redirect' to request, and allow to use int values as ttl
2011-11-15 03:09:15 -08:00
mark_story
87f5b6cf26 Fix more strict errors.
Fix strict errors in test files.
Remove a test in CakeEmail as array -> string causes a notice
in PHP 5.4
2011-11-13 20:47:55 -05:00
Clément Hallet
ecb88791c8 move 'redirect' to request, and allow to use int values as ttl 2011-11-13 17:45:33 +01:00
mark_story
254357e9c9 Merge branch '2.0' into 2.1 2011-11-11 22:38:11 -05:00
José Lorenzo Rodríguez
497ada8895 Merge pull request #311 from challet/HttpSocket_handle_redirect
optionnaly handles redirect before return the response
2011-11-09 09:42:52 -08:00
mark_story
89ced25fad Making HttpResponse more tolerant of line endings. 2011-11-08 19:23:36 -05:00
Clément Hallet
62ae6d57e9 optionnaly handles redirect before return the response 2011-11-08 18:55:58 +01:00
ADmad
01aa91b3cf Fixing bug where content length was not set for clients which don't accept compressed response. Closes #2225 2011-11-07 02:04:57 +05:30
Jose Lorenzo Rodriguez
d74b64d475 Merge remote-tracking branch 'origin/2.0' into 2.1 2011-11-04 12:09:31 -04:30
mark_story
0304bb8796 Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/VERSION.txt
2011-11-03 22:04:00 -04:00
Jose Lorenzo Rodriguez
2711178b4b Fixing Content-Length calculation when there is buffered output that will be sent before the response body. fixes #2208 2011-11-03 21:09:30 -04:30
Lubos Remplik
985dcad802 MimeType audio/ogg added 2011-11-01 08:17:36 -07:00
Yasushi Ichikawa
4aeb5b461d delete App::uses Multibyte class. It is no longer needed. 2011-10-31 23:47:36 +09:00
Yasushi Ichikawa
f39c683130 check mbstring.func_overload before using strlen() 2011-10-31 23:29:59 +09:00
Yasushi Ichikawa
e53287583e return byte length instead of number of characters in Content-Length 2011-10-31 18:31:08 +09:00
Juan Basso
fcd96bcc60 Using native methods to query in HttpSocket. 2011-10-29 15:40:41 -04:00
Jose Lorenzo Rodriguez
9866882506 Not sending a content-length for redirection status codes that are not supposed to have any content 2011-10-27 23:18:49 -04:30
Jose Lorenzo Rodriguez
4a453cc384 Fixes #2175
Adding automatic Content-Length header to hint browser of the end of the response when using persistent connections
2011-10-27 22:15:37 -04:30
mark_story
ad524b25ef Merge branch '2.0' into 2.1 2011-10-25 22:29:03 -04:00
Maggion Emmanuel
3dc9fee5c0 Typo 2011-10-25 22:22:10 -04:00
mark_story
621cb43e93 Add Opera Mobi to mobile detectors.
This was missed in a merge with 1.3.
Fixes #2087
2011-10-24 21:12:06 -04:00
mark_story
d6f7669f54 Merge branch '2.0' into 2.1 2011-10-23 21:07:09 -04:00
mark_story
8e69df9013 Revert "Fix RedirectRoute by stopping execution."
This reverts commit 841e7aa560.

Having _stop() on CakeResponse seemed like the wrong place to stop
execution.  It can make testing with redirects harder.
Instead RedirectRoute should be stopping execution.
2011-10-22 22:44:21 -04:00
mark_story
32b48ecc7c Fix issue with missing base on redirect route.
The request data wasn't set in Router when redirect routes are processed.
This caused the base to become missing. This causes issues with applications
running in a subdirectory.
2011-10-22 18:48:31 -04:00
Majna
841e7aa560 Fix RedirectRoute by stopping execution.
If CakeResponse sends a Location header, it will stop execution.
This fixes issues with where a body would be sent with redirect headers.
Tests updated.

Fixes #2143
2011-10-22 13:22:28 -04:00
mark_story
ab6aab8a1a Merge branch '2.0' into 2.1 2011-10-22 11:03:42 -04:00
Graham Weldon
212028cda2 Remove comments, and fix debug transport for email. 2011-10-23 00:23:50 +11:00
Graham Weldon
2844f4a477 Fixed sending BCC with DATA for CakeEmail, as well as 7->8bit conversion tests passing 2011-10-23 00:20:37 +11:00
Graham Weldon
7ed6e041b9 Changed getContentTransferEncoding to protected 2011-10-22 15:24:26 +11:00
mark_story
eb17653965 Implement $request->is('requested');
Add tests and new detector type for request parameters
Fixes #1995
2011-10-20 21:11:42 -04:00
Norio Suzuki
712822ef83 add some test for ISO-2022-JP charset mails 2011-10-20 00:18:42 +09:00
Graham Weldon
86a081463c Added content transfer encoding detection based on charset. 2011-10-19 16:02:31 +11:00
Graham Weldon
bd291456e8 Changed CakeEmail transport to 8bit 2011-10-19 15:20:55 +11:00
Jose Lorenzo Rodriguez
b38c0e50a4 Adding configuration options to CakeEmail to set the header encoding and body encoding, also translating
all string from the App.encoding value to the configured charset if they differ. This makes possible to
send correctly emails in japanese charset
2011-10-16 15:43:10 -04:30
mark_story
6bf6d79979 Removing 'cake' domain from core.
This domain was supposed to be replaced by cake_dev.
There are a number of translations that should be App land as well.
Such as those in helpers.

Fixes #2103
2011-10-14 21:01:17 -04:00
Majna
a5220fa7bb Fixed doc block comments. 2011-10-11 00:22:23 +02:00
ADmad
dcb704a12b Fixing bug where you couldn't set CakeRequest::$base to empty string using config variable App.base 2011-10-05 00:46:25 +05:30
mark_story
adcb80b5b9 Making the HtmlHelper a default helper for emails. 2011-10-01 22:55:04 -04:00
mark_story
c9bd97309f Merge branch '1.3' into merger
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
2011-10-01 22:38:20 -04:00
Ceeram
883f579670 fixing duplicate emails being sent with MailTransport fixes #2022 2011-09-29 15:00:48 +02:00
mark_story
50a0a51f53 Renaming method to better match what it does. 2011-09-24 21:56:37 -04:00
mark_story
ceed424770 Updating doc blocks. 2011-09-21 22:30:02 -04:00
Maggion Emmanuel
d675b4270d Fixed typo 2011-09-05 13:23:26 +03:00
Mark Story mark@mark-story.com
e2f48b4a95 Refactoring how q values are parsed, as content types were
reversed for similar q value types.  This causes issues in
RequestHandlerComponent.
2011-09-01 00:20:54 +01:00
Jose Lorenzo Rodriguez
b9b7516945 Merge remote-tracking branch 'ceeram/2.0-email' into 2.0
Conflicts:
	lib/Cake/Network/Email/AbstractTransport.php
	lib/Cake/Network/Email/CakeEmail.php
	lib/Cake/Network/Email/DebugTransport.php
	lib/Cake/Network/Email/MailTransport.php
	lib/Cake/Network/Email/SmtpTransport.php
2011-08-31 17:39:41 -04:30
Ceeram
0b00fb4fe0 fixing bug in deliver(), and adding more tests 2011-08-29 17:13:41 +02:00
Ceeram
3be9a8a5e8 debugtransport now also returns in correct format as stated in RFC 2822 2.3, updated tests 2011-08-29 11:21:46 +02:00
Ceeram
2efa3b0377 optmizing CakeEmail, and improving tests, transport class config() now returns configs array if no array is passed 2011-08-29 03:11:30 +02:00
mark_story
1a872e6544 Fixing CakeRequest::accepts() where ;q values on Accept header
were not respected.
Fixes #1940
2011-08-27 11:39:22 -04:00
Jose Lorenzo Rodriguez
f94394f582 Removing routing url from query string in CakeRequest. This happens mostly with nginx setups 2011-08-27 01:29:50 -04:30