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/libraries/Email.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'system/libraries/Email.php') diff --git a/system/libraries/Email.php b/system/libraries/Email.php index a55d2ffea..34ce5b156 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1630,6 +1630,12 @@ class CI_Email { */ public function send($auto_clear = TRUE) { + if ( ! isset($this->_headers['From']) ) + { + $this->_set_error_message('lang:email_no_sender'); + return FALSE; + } + if ($this->_replyto_flag === FALSE) { $this->reply_to($this->_headers['From']); -- 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/libraries/Email.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/libraries/Email.php') diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 34ce5b156..454482ef4 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1630,9 +1630,9 @@ class CI_Email { */ public function send($auto_clear = TRUE) { - if ( ! isset($this->_headers['From']) ) + if ( ! isset($this->_headers['From'])) { - $this->_set_error_message('lang:email_no_sender'); + $this->_set_error_message('lang:email_no_from'); return FALSE; } @@ -2273,4 +2273,4 @@ class CI_Email { } /* End of file Email.php */ -/* Location: ./system/libraries/Email.php */ \ No newline at end of file +/* Location: ./system/libraries/Email.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/libraries/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/libraries/Email.php') diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 454482ef4..5cb16896f 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -2273,4 +2273,4 @@ class CI_Email { } /* End of file Email.php */ -/* Location: ./system/libraries/Email.php */ +/* Location: ./system/libraries/Email.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/libraries/Email.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'system/libraries/Email.php') diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 5cb16896f..c042aaade 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.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