Merged in bugfix/HOR-3700-PQ (pull request #5974)

HOR-3700

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>

workflow/engine/methods/cases/cases_CatchExecute.php

@@ -63,7 +63,6 @@ if ($aDelegation['USR_UID'] == "") {
     /*----------------------------------********---------------------------------*/
     $licensedFeatures = &PMLicensedFeatures::getSingleton();
     if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-        require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
         $pmGoogle = new PmGoogleApi();
         if($pmGoogle->getServiceGmailStatus()) {
             $labGmail = new labelsGmail();

workflow/engine/methods/cases/derivatedGmail.php

@@ -17,7 +17,6 @@ $appDel = new AppDelegation();
 $actualThread = $appDel->Load($caseId, $actualIndex);
 $actualLastIndex = $actualThread['DEL_PREVIOUS'];
 
-require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
 $oLabels = new labelsGmail();
 $oLabels->addRelabelingToQueue($caseId, $actualIndex, $actualLastIndex, false);
 

workflow/engine/methods/services/utils.php

@@ -1,85 +0,0 @@
-<?php
-
-function postNote($httpData)
-{
-    //extract(getExtJSParams());
-    $appUid = (isset($httpData->appUid))? $httpData->appUid : '';
-
-    $usrUid = (isset($httpData->usrUid))? $httpData->usrUid : '' ;
-
-    require_once ( "classes/model/AppNotes.php" );
-
-    $appNotes = new AppNotes();
-    $noteContent = addslashes($httpData->noteText);
-
-    $result = $appNotes->postNewNote($appUid, $usrUid, $noteContent, false);
-
-
-
-    //send the response to client
-    @ini_set('implicit_flush', 1);
-    ob_start();
-
-    @ob_flush();
-    @flush();
-    @ob_end_flush();
-    ob_implicit_flush(1);
-    //return true;
-    //send notification in background
-    $noteRecipientsList = array();
-    $oCase = new Cases();
-
-    $p = $oCase->getUsersParticipatedInCase($appUid);
-
-    foreach ($p['array'] as $key => $userParticipated) {
-        if(!empty($key)){
-            $noteRecipientsList[] = $key;
-        }
-    }
-
-    $noteRecipients = implode(",", $noteRecipientsList);
-
-    $appNotes->sendNoteNotification($appUid, $usrUid, $noteContent, $noteRecipients);
-
-}
-
-function loadAbeRequest($AbeRequestsUid)
-{
-    require_once 'classes/model/AbeRequests.php';
-
-    $criteria = new Criteria();
-    $criteria->add(AbeRequestsPeer::ABE_REQ_UID, $AbeRequestsUid);
-    $resultRequests = AbeRequestsPeer::doSelectRS($criteria);
-    $resultRequests->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $resultRequests->next();
-    $abeRequests = $resultRequests->getRow();
-
-    return $abeRequests;
-}
-
-function loadAbeConfiguration($AbeConfigurationUid)
-{
-    require_once 'classes/model/AbeConfiguration.php';
-
-    $criteria = new Criteria();
-    $criteria->add(AbeConfigurationPeer::ABE_UID, $AbeConfigurationUid);
-    $result = AbeConfigurationPeer::doSelectRS($criteria);
-    $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-    $result->next();
-    $abeConfiguration = $result->getRow();
-
-    return $abeConfiguration;
-}
-
-function uploadAbeRequest($data)
-{
-    require_once 'classes/model/AbeRequests.php';
-
-    try {
-        $abeRequestsInstance = new AbeRequests();
-        $abeRequestsInstance->createOrUpdate($data);
-    } catch (Exception $error) {
-        throw $error;
-    }
-}
-

workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php

@@ -240,8 +240,7 @@ class Pmgmail {
      */
     public function deleteLabels($mail)
     {
-        require_once(PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
+        $oLabels = new \LabelsGmail();
-        $oLabels = new \labelsGmail();
 
         $response = $oLabels->deletePMGmailLabels($mail);
 
@@ -250,15 +249,13 @@ class Pmgmail {
 
     public function modifyMailToPauseCase($appUid, $appDelIndex)
     {
-        require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
+        $oLabels = new \LabelsGmail();
-        $oLabels = new \labelsGmail();
         $oResponse = $oLabels->setLabelsToPauseCase($appUid, $appDelIndex);
     }
 
     public function modifyMailToUnpauseCase($appUid, $appDelIndex)
     {
-        require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
+        $oLabels = new \LabelsGmail();
-        $oLabels = new \labelsGmail();
         $oResponse = $oLabels->setLabelsToUnpauseCase($appUid, $appDelIndex);
     }