Make email sender configurable

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 4 insertions, 8 deletions

diff --git a/application/config/config.php b/application/config/config.php
index d386a77b8..2191b21df 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -363,6 +363,9 @@ $config['proxy_ips'] = '';
 |--------------------------------------------------------------------------
  */
 
+// This address will be used as the sender for emails (like password recovery mails).
+$config['email_from'] = "webmaster@example.invalid";
+
 // upload_path should NOT be readable/served by the server, but only by the script
 $config['upload_path'] = FCPATH.'data/uploads';
 
diff --git a/application/controllers/user.php b/application/controllers/user.php
index b542f2b4c..be4359404 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -340,14 +340,7 @@ class User extends MY_Controller {
 			))
 			->insert('actions');
 
-		$admininfo = $this->db->select('email')
-			->from('users')
-			->where('referrer', NULL)
-			->order_by('id', 'asc')
-			->limit(1)
-			->get()->row_array();
-
-		$this->email->from($admininfo["email"]);
+		$this->email->from($this->config->item("email_from"));
 		$this->email->to($userinfo["email"]);
 		$this->email->subject("FileBin password reset");
 		$this->email->message(""