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
16,900 Commits 31 Branches 527 Tags 162 MiB
88a4e69de6
Commit Graph

108 Commits

Author SHA1 Message Date
Dan Hensby
6c8dc0fd99
Fix deprecated php syntax 2020-04-01 14:03:03 +01:00
Daniel Hensby
9103816333
NEW Add php 7.2 support 2018-01-30 16:50:32 +00:00
Daniel Hensby
20e486690c
Merge branch '3.4' into 3.5 2017-01-17 11:58:56 +00:00
Chris Lock
6057df3202 Adding lots of PHPDoc 2017-01-17 09:54:18 +00:00
Patrick Nelson
74c555e004 FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards. 2016-07-14 10:25:40 -07:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Ed Linklater
856722a561 Handle incorrectly deprecated validEmailAddr methods 2015-11-10 13:17:27 +13:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality 
Fixes #4514
 2015-08-24 11:26:25 +12:00
Damian Mooyman
e14f743bf0 Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
Damian Mooyman
e47800917a API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding 
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
 2014-09-25 16:04:56 +12:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes. 
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
 2014-08-18 16:00:13 +12:00
Simon Welsh
dde90dc346 Correct line length and endings 2014-03-30 19:51:38 +13:00
Ingo Schommer
0d7e9a9692 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
 2014-02-04 08:19:04 +13:00
Ingo Schommer
ab070944d5 Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list 
Conflicts:
	view/SSTemplateParser.php
	view/SSTemplateParser.php.inc
 2014-01-31 15:15:59 +13:00
madmatt
bebe0f6e37 Updating @package and @subpackage doc tags 2013-11-29 17:49:30 +13:00
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Ingo Schommer
6f02c5bd98 Email fluent API regression (fixes #2581) 2013-10-22 20:31:29 +02:00
Ingo Schommer
8ef14d2df4 Fluent API for Email 2013-10-21 10:58:45 +02:00
Andrew Short
bfdf14fafa Merge branch '3.1' 2013-07-09 13:42:32 +10:00
Jeremy Thomerson
7aeaf74c22 MINOR: fix Email class modifying SSViewer.source_file_comments config val 
The Email class was updating the SSViewer.source_file_comments value and not
resetting it. If someone had this value set to true in their system and then
used the Email class, it seems there would be an unintended side-effect of
having the source file comments turned off.
 2013-06-21 02:36:01 +00:00
Ingo Schommer
4d36b97543 Check for $bounceAddress before using (fixes #3359) 2013-04-05 11:46:15 +02:00
Ingo Schommer
3a911ebb00 Fixed Email.admin_email config static naming 2013-03-27 13:41:24 +01:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Justin Martin
22e7313d93 Bug: Fixed BC break (ancestry) in Mailer 2013-03-12 10:56:39 -07:00
Ingo Schommer
7f4c173369 Fixed indentation in Mailer 
No functional changes
 2013-01-30 12:52:18 +01:00
Ingo Schommer
7327f120aa Re-added wrapImagesInline and wrapImagesInline_rewriter to Mailer class 
Deprecated in fb076c03, but can't be removed just yet.
Also included some fixes which have since been applied in 3.0 to this.
 2013-01-30 12:48:54 +01:00
Ingo Schommer
634c91c6ff Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	email/Mailer.php
 2013-01-30 12:46:24 +01:00
Carlos Barberis
33a1fc7b3a FIX: Fixed operation of inlined images in Mailer, when no inlined images actually attached. 2013-01-29 18:03:47 +01:00
Sam Minnee
c3a3ff4438 NEW: Added Email::send_all_emails_from() setting. 2013-01-29 18:03:30 +01:00
Sam Minnee
5e6f5f9f7e NEW: Allow configuration of send_all_emails_to, ccs_all_emails_to, and bcc_all_emails_to via the config system. 2013-01-29 18:03:27 +01:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
 2013-01-21 11:14:57 +01:00
Sam Minnee
0c9b216894 FIX: Escape the -f argument passed to mail() 2013-01-18 11:24:23 +13:00
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