Fixes #299: Routing password request through outging server

forgotPassword.php

@@ -11,9 +11,8 @@
 require_once 'includes/main/WebUI.php';
 require_once 'include/utils/utils.php';
 require_once 'include/utils/VtlibUtils.php';
-require_once 'modules/Emails/class.phpmailer.php';
-require_once 'modules/Emails/mail.php';
 require_once 'modules/Vtiger/helpers/ShortURL.php';
+require_once 'vtlib/Vtiger/Mailer.php';
 
 global $adb;
 $adb = PearDatabase::getInstance();
@@ -46,20 +45,17 @@ if (isset($_REQUEST['username']) && isset($_REQUEST['emailId'])) {
 						This request was made on '.date("Y-m-d H:i:s").' and will expire in next 24 hours.<br><br> 
 						Regards,<br> 
 						VtigerCRM Open source Support Team.<br>';
-		$mail = new PHPMailer();
-		$query = "select from_email_field,server_username from vtiger_systems where server_type=?";
-		$params = array('email');
-		$result = $adb->pquery($query, $params);
-		$from = $adb->query_result($result, 0, 'from_email_field');
-		if ($from == '') {
-			$from = $adb->query_result($result, 0, 'server_username');
-		}
-		$subject = 'Request : ForgotPassword - vtigercrm';
 
-		setMailerProperties($mail, $subject, $content, $from, $username, $email);
-		$status = MailSend($mail);
-		var_dump($status);
-		if ($status === 1) {
+		$subject = 'Vtiger CRM: Password Reset';
+
+		$mail = new Vtiger_Mailer();
+		$mail->IsHTML();
+		$mail->Body = $content;
+		$mail->Subject = $subject;
+		$mail->AddAddress($email);
+
+		$status = $mail->Send(true);
+		if ($status === 1 || $status === true) {
 			header('Location:  index.php?modules=Users&view=Login&mailStatus=success');
 		} else {
 			header('Location:  index.php?modules=Users&view=Login&error=statusError');
@@ -67,4 +63,4 @@ if (isset($_REQUEST['username']) && isset($_REQUEST['emailId'])) {
 	} else {
 		header('Location:  index.php?modules=Users&view=Login&error=fpError');
 	}
-}
\ No newline at end of file
+}