updated the email handling for resets & new users to pass along error…

…s to the UI

OpenVBX/controllers/auth/reset.php

@@ -110,9 +110,14 @@ public function reset()
 		else
 		{
 			$user = new VBX_User($user);
-			$user->send_reset_notification();
-			$this->session->set_flashdata('error',
-										  'To complete the password reset, check your inbox.');
+			$emailSent = $user->send_reset_notification();
+			if ($emailSent) {
+				$this->session->set_flashdata('error',
+                            'To complete the password reset, check your inbox.');
+			} else {
+				$this->session->set_flashdata('error',
+							'The email was not sent. Contact your admin.');
+			}
 			return redirect('auth/login');
 		}
 

OpenVBX/models/vbx_user.php

@@ -435,6 +435,12 @@ public function get_active_users()
 		return self::search(array('is_active' => 1));
 	}
 
+    /*
+     * This method attempts to send the notification and gives us a true/false
+     *    depending on if it worked.
+     *
+     * @return boolean
+     */
 	public function send_reset_notification()
 	{
 		// Set a random invitation code for resetting password
@@ -446,9 +452,14 @@ public function send_reset_notification()
 			'invite_code' => $this->invite_code,
 			'reset_url' => tenant_url("/auth/reset/{$this->invite_code}", $this->tenant_id)
 		);
-		openvbx_mail($this->email, 'Reset your password', 'password-reset', $maildata);
+		return openvbx_mail($this->email, 'Reset your password', 'password-reset', $maildata);
 	}
 
+	/*
+	 * This method attempts to send the email and returns a boolean depending on if it worked.
+	 *
+	 * @return boolean
+	 */
 	public function send_new_user_notification()
 	{
 		// Set a random invitation code for resetting password
@@ -461,7 +472,7 @@ public function send_new_user_notification()
 			'name' => $this->first_name,
 			'reset_url' => tenant_url("/auth/reset/{$this->invite_code}", $this->tenant_id)
 		);
-		openvbx_mail($this->email, 'Welcome aboard', 'welcome-user', $maildata);
+		return openvbx_mail($this->email, 'Welcome aboard', 'welcome-user', $maildata);
 	}
 
 	/**