cron/modules/com_vtiger_workflow/com_vtiger_workflow.service

@@ -49,17 +49,18 @@ function vtRunTaskJob($adb){
 	$readyTasks = $tq->getReadyTasks();
 	$tm = new VTTaskManager($adb);
 	foreach($readyTasks as $taskDetails){
-		list($taskId, $entityId, $taskContents) = $taskDetails;
+		list($taskId, $entityId, $taskContents, $relatedInfo) = $taskDetails;
 		$task = $tm->retrieveTask($taskId);
-        //If task is not there then continue
-        if(empty($task)){
-            continue;
-        }
+		//If task is not there then continue
+		if(empty($task)){
+			continue;
+		}
 		$task->setContents($taskContents);
-        $entity = VTEntityCache::getCachedEntity($entityId);
-        if(!$entity) {
-            $entity = new VTWorkflowEntity($adminUser, $entityId);
-        }
+		$task->setRelatedInfo($relatedInfo);
+		$entity = VTEntityCache::getCachedEntity($entityId);
+		if(!$entity) {
+			$entity = new VTWorkflowEntity($adminUser, $entityId);
+		}
 
 		$task->doTask($entity);
 	}

cron/send_mail.php

@@ -22,13 +22,13 @@
 //file modified by richie
 
 
-require("class.smtp.php");
-require("class.phpmailer.php");
+// require_once("modules/Emails/class.smtp.php");
+// require_once("modules/Emails/class.phpmailer.php");
 require_once 'include/utils/CommonUtils.php';
 
 function sendmail($to,$from,$subject,$contents,$mail_server,$mail_server_username,$mail_server_password,$filename,$smtp_auth='')
 {
-  $mail = new PHPMailer();
+  $mail = new PHPMailer\PHPMailer\PHPMailer();
   $mail->Subject = $subject;
 	$mail->Body    = $contents;//"This is the HTML message body <b>in bold!</b>";
 
@@ -42,17 +42,17 @@ function sendmail($to,$from,$subject,$contents,$mail_server,$mail_server_usernam
 	else
 		$mail->SMTPAuth = false;
 	$mail->Username = $mail_server_username ;//$smtp_username;  // SMTP username
-	$mail->Password = $mail_server_password ;//$smtp_password; // SMTP password
+	$mail->Password = Vtiger_Functions::fromProtectedText($mail_server_password);//$smtp_password; // SMTP password
 	$mail->From = $from;
 	$mail->FromName = $initialfrom;
 	$mail->AddAddress($to);                  // name is optional
 	$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;

data/Tracker.php

@@ -44,14 +44,21 @@ class Tracker {
         "item_id",
         "item_summary"
     );
-
-    function Tracker()
+	function __construct()
     {
-        $this->log = LoggerManager::getLogger('Tracker');
-	// $this->db = PearDatabase::getInstance();
-	global $adb;
+        $this->log = Logger::getLogger('Tracker');
+		// $this->db = PearDatabase::getInstance();
+		global $adb;
         $this->db = $adb;
     }
+    function Tracker()
+    {
+		
+		// PHP4-style constructor.
+        // This will NOT be invoked, unless a sub-class that extends `foo` calls it.
+        // In that case, call the new-style constructor to keep compatibility.
+        self::__construct();
+    }
 
     /**
      * Add this new item to the vtiger_tracker vtiger_table.  If there are too many items (global config for now)
@@ -84,7 +91,7 @@ $log->info("in  track view method ".$current_module);
 			 $fl = array();
 			 foreach($fieldlists as $w => $c)
 			 {
-				 if (count($fl))
+				 if (php7_count($fl))
 				 	$fl[] = "' '";
 				 $fl[] = $c;
 			 }
@@ -137,7 +144,7 @@ $log->info("in  track view method ".$current_module);
 
 
             // If the module was not specified or the module matches the module of the row, add the row to the list
-            if($module_name == "" || $row[module_name] == $module_name)
+            if($module_name == "" || $row["module_name"] == $module_name)
             {
 		//Adding Security check
 		require_once('include/utils/utils.php');

include/ComboStrings.php

@@ -355,8 +355,7 @@ $combo_strings = Array(
 );
 
 require_once('modules/Users/UserTimeZonesArray.php');
-$usertimezonesClass = new UserTimeZones();
-$arrayOfSupportedTimeZones = $usertimezonesClass->userTimeZones();
+$arrayOfSupportedTimeZones = UserTimeZones::getAll();
 $combo_strings['time_zone_dom'] = array_combine($arrayOfSupportedTimeZones,$arrayOfSupportedTimeZones);
 
 ?>

include/ComboUtil.php

@@ -31,7 +31,7 @@ function getComboArray($combofieldNames)
 		if(!is_admin($current_user))
 		{
 			$subrole = getRoleSubordinates($roleid);
-			if(count($subrole)> 0)
+			if(php7_count($subrole)> 0)
 			{
 				$roleids = $subrole;
 				array_push($roleids, $roleid);

include/ListView/RelatedListViewSession.php

@@ -23,13 +23,20 @@ class RelatedListViewSession {
 	var $sorder = null;
 	var $sortby = null;
 	var $page_view = null;
-
-	function RelatedListViewSession() {
-		global $log,$currentModule;
+	
+	function __construct()
+    {
+        global $log,$currentModule;
 		$log->debug("Entering RelatedListViewSession() method ...");
 
 		$this->module = $currentModule;
 		$this->start =1;
+    }
+	function RelatedListViewSession() {
+		// PHP4-style constructor.
+        // This will NOT be invoked, unless a sub-class that extends `foo` calls it.
+        // In that case, call the new-style constructor to keep compatibility.
+        self::__construct();
 	}
 
 	public static function addRelatedModuleToSession($relationId, $header) {