From 0b85d6b3bb0236a6567ebc8f42b643d5486070ef Mon Sep 17 00:00:00 2001 From: Michael Granados Date: Sun, 9 Nov 2014 02:43:48 -0200 Subject: Verifying From header before send mail Signed-off-by: Michael Granados --- system/language/english/email_lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'system/language/english/email_lang.php') diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index fdd823bc8..d63e700fe 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -41,6 +41,7 @@ $lang['email_must_be_array'] = 'The email validation method must be passed an ar $lang['email_invalid_address'] = 'Invalid email address: %s'; $lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s'; $lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s'; +$lang['email_no_sender'] = 'You must include sender (From)'; $lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc'; $lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.'; $lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.'; -- cgit v1.2.3-24-g4f1b From 92e2fd2320a27519922e2927cf810d8c846e7b4e Mon Sep 17 00:00:00 2001 From: Michael Granados Date: Tue, 11 Nov 2014 21:49:26 -0200 Subject: Making required changes Signed-off-by: Michael Granados --- system/language/english/email_lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/language/english/email_lang.php') diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index d63e700fe..b7b09f2c2 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -41,7 +41,7 @@ $lang['email_must_be_array'] = 'The email validation method must be passed an ar $lang['email_invalid_address'] = 'Invalid email address: %s'; $lang['email_attachment_missing'] = 'Unable to locate the following email attachment: %s'; $lang['email_attachment_unreadable'] = 'Unable to open this attachment: %s'; -$lang['email_no_sender'] = 'You must include sender (From)'; +$lang['email_no_from'] = 'Cannot send mail with no "From" header.'; $lang['email_no_recipients'] = 'You must include recipients: To, Cc, or Bcc'; $lang['email_send_failure_phpmail'] = 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.'; $lang['email_send_failure_sendmail'] = 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.'; @@ -58,4 +58,4 @@ $lang['email_smtp_data_failure'] = 'Unable to send data: %s'; $lang['email_exit_status'] = 'Exit status code: %s'; /* End of file email_lang.php */ -/* Location: ./system/language/english/email_lang.php */ \ No newline at end of file +/* Location: ./system/language/english/email_lang.php */ -- cgit v1.2.3-24-g4f1b From dfa1e4034ee944ee250aea46322565188dab2ab3 Mon Sep 17 00:00:00 2001 From: Michael Granados Date: Wed, 12 Nov 2014 23:19:07 -0200 Subject: Removing empty lines Signed-off-by: Michael Granados --- system/language/english/email_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/language/english/email_lang.php') diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index b7b09f2c2..b6f03c71c 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -58,4 +58,4 @@ $lang['email_smtp_data_failure'] = 'Unable to send data: %s'; $lang['email_exit_status'] = 'Exit status code: %s'; /* End of file email_lang.php */ -/* Location: ./system/language/english/email_lang.php */ +/* Location: ./system/language/english/email_lang.php */ \ No newline at end of file -- cgit v1.2.3-24-g4f1b From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 9 Jan 2015 17:48:58 +0200 Subject: Bulk (mostly documentation) update - Remove PHP version from license notices - Bump year number in copyright notices - Recommend PHP 5.4 or newer to be used - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version Related: #3450 --- system/language/english/email_lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/language/english/email_lang.php') diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php index b6f03c71c..cd8fa8932 100644 --- a/system/language/english/email_lang.php +++ b/system/language/english/email_lang.php @@ -2,11 +2,11 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.2.4 or newer + * An open source application development framework for PHP * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014, British Columbia Institute of Technology + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link http://codeigniter.com * @since Version 1.0.0 -- cgit v1.2.3-24-g4f1b