fix Issue #431 - upgrade php mailer to v5.2.27 (modules/email + cron)

cron/SendReminder.service

@@ -22,6 +22,7 @@
 //file modified by richie
 
 require_once('include/utils/utils.php');
+require_once("modules/Emails/class.smtp.php");
 require_once("modules/Emails/class.phpmailer.php");
 require_once("modules/Emails/mail.php");
 require_once('include/logging.php');
@@ -51,14 +52,14 @@ $app_strings = return_application_language($current_language);
 
 //modified query for recurring events -Jag
 $query="SELECT vtiger_crmentity.crmid, vtiger_crmentity.description, vtiger_crmentity.smownerid, vtiger_seactivityrel.crmid AS setype,vtiger_activity.*,vtiger_activity_reminder.reminder_time,
-		vtiger_activity_reminder.reminder_sent,vtiger_activity_reminder.recurringid FROM vtiger_activity 
-		INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_activity.activityid 
-		INNER JOIN vtiger_activity_reminder ON vtiger_activity.activityid=vtiger_activity_reminder.activity_id 
-		LEFT OUTER JOIN vtiger_seactivityrel ON vtiger_seactivityrel.activityid = vtiger_activity.activityid 
-		WHERE DATE_FORMAT(vtiger_activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' AND vtiger_crmentity.crmid != 0 AND 
-		(vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held','Cancelled')) 
+		vtiger_activity_reminder.reminder_sent,vtiger_activity_reminder.recurringid FROM vtiger_activity
+		INNER JOIN vtiger_crmentity ON vtiger_crmentity.crmid=vtiger_activity.activityid
+		INNER JOIN vtiger_activity_reminder ON vtiger_activity.activityid=vtiger_activity_reminder.activity_id
+		LEFT OUTER JOIN vtiger_seactivityrel ON vtiger_seactivityrel.activityid = vtiger_activity.activityid
+		WHERE DATE_FORMAT(vtiger_activity.date_start,'%Y-%m-%d, %H:%i:%s') >= '".date('Y-m-d')."' AND vtiger_crmentity.crmid != 0 AND
+		(vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus NOT IN ('Held','Cancelled'))
 		AND (vtiger_activity.status is NULL OR vtiger_activity.status NOT IN ('Completed', 'Deferred', 'Cancelled'))
-		AND vtiger_activity_reminder.reminder_sent = 0 AND vtiger_activity_reminder.reminder_time != 0 
+		AND vtiger_activity_reminder.reminder_sent = 0 AND vtiger_activity_reminder.reminder_time != 0
 		GROUP BY vtiger_activity.activityid";
 $result = $adb->pquery($query, array());
 
@@ -170,7 +171,7 @@ if($adb->num_rows($result) >= 1)
 			$result_set['subject'] = decode_html($result_set['subject']);
 			if($result_set['activitytype'] == "Task") {
 				$enddateInOwnerFormat = $enddateTime->getDisplayDate($ownerFocus);
-				$list = $todoReminderBody;				
+				$list = $todoReminderBody;
 				$list = str_replace('$calendar-subject$',$result_set['subject'],$list);
 				$list = str_replace('$calendar-description$',$result_set['description'],$list);
 				$list = str_replace('$calendar-date_start$', $dateTimeInOwnerFormat.' '.$ownerTimeZone, $list);

cron/send_mail.php

@@ -49,10 +49,10 @@ function sendmail($to,$from,$subject,$contents,$mail_server,$mail_server_usernam
 	$mail->AddReplyTo($from);
 	$mail->WordWrap = 50;                                 // set word wrap to 50 characters
 	$mail->IsHTML(true);                                  // set email format to HTML
-	
+
 	$mail->AltBody = "This is the body in plain text for non-HTML mail clients";
 //	$mail->Sender= getReturnPath($mail->Host);
-	if(!$mail->Send()) 
+	if(!$mail->Send())
 	{
 	   echo "Message could not be sent. <p>";
 	   echo "Mailer Error: " . $mail->ErrorInfo;

modules/Emails/mail.php

@@ -9,7 +9,7 @@
  *
  ********************************************************************************/
 
-
+require_once('modules/Emails/class.smtp.php');
 require_once("modules/Emails/class.phpmailer.php");
 require_once 'include/utils/CommonUtils.php';
 require_once 'include/utils/VTCacheUtils.php';
@@ -278,7 +278,7 @@ function setMailServerProperties($mail)
 {
 	global $adb;
 	$adb->println("Inside the function setMailServerProperties");
-        
+
 	$res = $adb->pquery("select * from vtiger_systems where server_type=?", array('email'));
 	if(isset($_REQUEST['server'])) {
 		$server = $_REQUEST['server'];
@@ -327,7 +327,7 @@ function setMailServerProperties($mail)
     $mail->Host = $server;		// specify main and backup server
 	$mail->Username = $username ;	// SMTP username
     $mail->Password = Vtiger_Functions::fromProtectedText($password);	// SMTP password
-    
+
     // To Support TLS
     $serverinfo = explode("://", $server);
     $smtpsecure = $serverinfo[0];
@@ -336,7 +336,7 @@ function setMailServerProperties($mail)
         $mail->Host = $serverinfo[1];
     }
     // End
-    
+
 	return;
 }
 

pkg/vtiger/modules/CustomerPortal/modules/CustomerPortal/include.inc

@@ -26,6 +26,7 @@ include_once 'include/Zend/Json.php';
 include_once 'include/QueryGenerator/QueryGenerator.php';
 include_once 'include/Webservices/DescribeObject.php';
 include_once 'includes/runtime/LanguageHandler.php';
+include_once 'modules/Emails/class.smtp.php';
 include_once 'modules/Emails/class.phpmailer.php';
 include_once 'modules/ModTracker/ModTracker.php';
 include_once 'modules/Contacts/Contacts.php';

vtlib/Vtiger/Mailer.php

@@ -7,6 +7,7 @@
  * Portions created by vtiger are Copyright (C) vtiger.
  * All Rights Reserved.
  ************************************************************************************/
+require_once('modules/Emails/class.smtp.php');
 require_once('modules/Emails/class.phpmailer.php');
 include_once('include/utils/CommonUtils.php');
 include_once('config.inc.php');
@@ -247,7 +248,7 @@ class Vtiger_Mailer extends PHPMailer {
 				$queue_record = $adb->fetch_array($queue, $index);
 				$queueid = $queue_record['id'];
 				$relcrmid= $queue_record['relcrmid'];
-				
+
 				$mailer->From = $queue_record['fromemail'];
 				$mailer->From = $queue_record['fromname'];
 				$mailer->Subject=$queue_record['subject'];