tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
10,480 Commits 31 Branches 527 Tags 162 MiB
340776feb3
Commit Graph

75 Commits

Author SHA1 Message Date
Simon Welsh
e20f15df55 Remove /e option due to preg_replace_callback use 2012-12-20 15:35:40 +13:00
Simon Welsh
c56a80d6ce Use preg_replace_callback over preg_replace with e modifier 2012-12-20 13:40:42 +13:00
Ingo Schommer
5fed5b91c9 API Moved email bounce handling to new 'emailbouncehandler' module 2012-12-12 23:36:42 +01:00
Ingo Schommer
f03ad7b0dd Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.AddForm.js
	control/Director.php
	control/HTTPResponse.php
	dev/Profiler.php
	email/Mailer.php
	forms/ComplexTableField.php
	forms/ManyManyComplexTableField.php
	forms/SimpleImageField.php
	forms/TableField.php
	forms/TableListField.php
	javascript/ComplexTableField.js
	javascript/ImageFormAction.js
	javascript/TableField.js
	javascript/TableListField.js
	security/Member.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/forms/TableListFieldTest.php
 2012-12-12 10:11:56 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
fb076c0396 API Deprecated global email methods, moved to Mailer class 
Code reorganization to reduce global scope pollution.
Removed non-functional `$inlineImages` option for sending emails.
 2012-12-09 22:09:35 +01:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Sean Harvey
19bdd4b4c5 Merge pull request #774 from icecaster/master 
fixing strict notice by declaring static method Email::is_valid_address() as static
 2012-09-05 19:04:20 -07:00
icecaster
dc4ccc7203 delcared Email::is_valid_address($email) as public static to avoid strict notice ("Non-static method Email::is_valid_address() should not be called statically, assuming $this from incompatible context") 2012-09-06 13:37:44 +12:00
Stig Lindqvist
dffae1a2e7 API CHANGE: Do not rely on a specific OS mime type detection, use PHP finfo 
This also removes the $global_mimetypes that was generating weird errors when both HTTP and Mailer classes tried to modify and use it.

Support of finfo should be straightforward since PHP 5.3 includes that module that default
 2012-05-11 11:34:07 +12:00
Sam Minnee
364d413c66 BUGFIX: Send plaintext email as text/plain if there are no attachments. (#4603) 2012-04-18 10:11:50 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +01:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard 
All sapphire but the lang directory
 2012-02-12 12:40:16 -08:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
5e9ba3c1d5 BUGFIX Correct formatting of "Content-Type: ...; charset=..." header in HTTPResponse and Mailer (breaks Adobe BrowserLab) 2011-07-15 07:05:50 +02:00
Colin Burns
4d99686081 Editing the /sapphire/email/mime.types file to allow Microsoft Office 2010 file extensions which were not previously in this file. This prevented these files from being sent as attachments on emails. I have added in the basic extensions of .docx, .pptx, .xlsx but also the additional extensions that Office 2010 have from this page - http://office.microsoft.com/en-us/help/introduction-to-new-file-name-extensions-HA010006935.aspx#BM1 
I have no idea if the macro enabled file extensions like .xltm or .docm pose a security threat, but thought that if I was adding the basic types in I should add the others as well. I'll let someone else decide this as I have no idea :)
 2011-05-03 22:56:34 -07:00
ajshort
356fe947ca API CHANGE: Removed the unused Notifications class. 2011-04-26 11:01:38 +10:00
Ingo Schommer
59230d8e39 API CHANGE Removed unused QueuedEmail and QueuedEmailDispatchTask 2011-03-29 21:44:54 +13:00
Ingo Schommer
1225426e75 MINOR Fixed @package declarations 2011-03-29 18:07:58 +13:00
Ingo Schommer
7cb35435f1 MINOR Allowing parameter in Email::attachFile() to be optional (fixes #6506, thanks adrianduke) 2011-03-20 09:56:05 +13:00
Carlos Barberis
184e8bd852 ENHANCEMENT: Added allowed actions to core classes 2011-02-14 11:14:51 +13:00
Ingo Schommer
949cadf377 MINOR Fixed broken links in docblocks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115949 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-01 20:05:47 +00:00
Sean Harvey
6faf418693 BUGFIX #6240 Line length of emails sent out by Mailer.php set too long and could cause emails to be marked as spam by certain filters (thanks florian.thoma!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-17 00:56:03 +00:00
Sean Harvey
fc3101760f ENHANCEMENT Always encode email subject as UTF-8 (thanks syntax!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115151 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-17 00:15:01 +00:00
Sam Minnee
58a50b7351 BUGFIX: Applied/edited paradigmincarnate's patch to quote plaintext email with htmlEmail (#5120) (from r108396) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112723 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-18 22:51:54 +00:00
Ingo Schommer
07e3fb9879 API CHANGE Removed deprecated Email_Template class, please use Email instead! (from r100503) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105583 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:04:33 +00:00
Sam Minnee
0bb067eddf BUGFIX: Made use of new BasicAuth::protect_entire_site() consistent. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91658 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-15 23:43:30 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog. 
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-26 03:06:31 +00:00
Sean Harvey
bf67f48aac Merged in Email template codes change from branches/2.3 - r84594 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86678 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-18 03:04:57 +00:00
Sean Harvey
b77d088d47 Merged in parent::__construct() additions from branches/2.3 - r83580 and r83587 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86676 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-18 03:02:19 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode. 
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 02:36:46 +00:00
Sam Minnee
c52f67aae5 MINOR ajshort: Replaced usage of the deprecated split() function with preg_split(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79568 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-18 09:34:17 +00:00
Sean Harvey
c83770f403 API CHANGE Removed @deprecated 2.3 function Email::setFormat() - this was not used anywhere 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77400 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-20 07:52:32 +00:00
Sean Harvey
8c5eb9bcc6 BUGFIX #3788 Default values are overwritten in Email constructor (rjmackay) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77273 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-19 23:23:45 +00:00
Sean Harvey
b20b6e0f95 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76269 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 06:36:16 +00:00
Sean Harvey
9b75cb1987 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75845 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:49:34 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Sean Harvey
f53062cd3b ENHANCEMENT Allow setting the "Reply-To" header by calling Email->ReplyTo('my@emailhere.com') 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73655 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-25 22:02:30 +00:00
Sean Harvey
c4d966c6a1 BUGFIX Explicitly define customHeaders as an array, and ensure send()/sendPlain() both use customHeaders 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73654 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-25 21:56:25 +00:00
Sean Harvey
2f2910eac3 MINOR Fixed inconsistency of using a global $project instead of global project() function in Email 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73652 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-25 21:46:48 +00:00
Sean Harvey
bd9778067c BUGFIX Fixed potential PHP notices if headers array not set for Bcc and Cc 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73651 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-25 21:43:01 +00:00
Sean Harvey
0085a1ad9d MINOR Code formatting fixes to Email 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73650 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-25 21:27:01 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-22 22:59:14 +00:00
Ingo Schommer
187a1f6f30 MINOR documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73232 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 20:20:08 +00:00
Ingo Schommer
67f4e76cee MINOR Formatting (mostly indentation) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73226 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 09:12:54 +00:00
Ingo Schommer
331ea15e45 MINOR Documentation for email classes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73225 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-17 09:07:33 +00:00