Merged in 3.0.1.7-Gmail (pull request #3430)

PM-4483, PM-4481, PM-4448

workflow/engine/bin/cron_single.php

@@ -339,6 +339,8 @@ function processWorkspace()
         /*----------------------------------********---------------------------------*/
         fillReportByUser();
         fillReportByProcess();
+        synchronizeDrive();
+        synchronizeGmailLabels();
         /*----------------------------------********---------------------------------*/
     } catch (Exception $oError) {
         saveLog("main", "error", "Error processing workspace : " . $oError->getMessage() . "\n");
@@ -957,5 +959,66 @@ function fillReportByProcess ()
 		saveLog("fillReportByProcess", "error", "Error in fill report by process: " . $e->getMessage());
 	}
 }
-/*----------------------------------********---------------------------------*/
 
+function synchronizeDrive ()
+{
+    try {
+        global $argvx;
+
+        if (strpos($argvx, "synchronize-documents-drive") === false) {
+            return false;
+        }
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+            G::LoadClass('AppDocumentDrive');
+            $drive = new AppDocumentDrive();
+            if ($drive->getStatusDrive()) {
+                setExecutionMessage("Synchronize documents to Drive");
+                $drive->synchronizeDrive(true);
+            } else {
+                setExecutionMessage("It has not enabled Feature Drive");
+            }
+        } else {
+            setExecutionMessage("The Drive license is not enabled");
+        }
+        setExecutionResultMessage("DONE");
+
+    } catch (Exception $e) {
+        setExecutionResultMessage("WITH ERRORS", "error");
+        eprintln("  '-" . $e->getMessage(), "red");
+        saveLog("synchronizeDocumentsDrive", "error", "Error in synchronize documents to drive: " . $e->getMessage());
+    }
+}
+
+function synchronizeGmailLabels()
+{
+    try {
+        global $argvx;
+
+        if (strpos($argvx, "synchronize-gmail-labels") === false) {
+            return false;
+        }
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+            G::LoadClass("pmGoogleApi");
+            $pmGoogle = new PMGoogleApi();
+            if ($pmGoogle->getServiceGmailStatus()) {
+                setExecutionMessage("Synchronize labels in Gmail");
+                G::LoadClass('labelsGmail');
+                $labGmail = new labelsGmail();
+                $labGmail->processPendingRelabelingInQueue();
+            } else {
+                setExecutionMessage("It has not enabled Feature Gmail");
+            }
+        } else {
+            setExecutionMessage("The Gmail license is not enabled");
+        }
+        setExecutionResultMessage("DONE");
+
+    } catch (Exception $e) {
+        setExecutionResultMessage("WITH ERRORS", "error");
+        eprintln("  '-" . $e->getMessage(), "red");
+        saveLog("synchronizeGmailLabels", "error", "Error when synchronizing Gmail labels: " . $e->getMessage());
+    }
+}
+/*----------------------------------********---------------------------------*/

workflow/engine/classes/class.AppDocumentDrive.php

@@ -0,0 +1,441 @@
+<?php
+
+G::LoadClass( "pmDrive" );
+
+/**
+ * Class InputDocumentDrive
+ */
+class AppDocumentDrive
+{
+    /**
+     * @var PMDrive $drive
+     */
+    private $drive;
+    /**
+     * @var Application $app
+     */
+    private $app;
+
+    /**
+     * @var Users $user
+     */
+    private $user;
+
+    private $statusDrive;
+    private $usersEmail = '';
+
+    /**
+     * InputDocumentDrive constructor.
+     */
+    public function __construct()
+    {
+        $this->drive = new PMDrive();
+        $status = $this->drive->getServiceDriveStatus();
+        $status = !empty($status) ? ($status == 1 ? true : false): false;
+        $this->usersEmail = '';
+        $this->setStatusDrive($status);
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getStatusDrive()
+    {
+        return $this->statusDrive;
+    }
+
+    /**
+     * @param boolen $statusDrive
+     */
+    public function setStatusDrive($statusDrive)
+    {
+        $this->statusDrive = $statusDrive;
+    }
+
+    public function loadUser ($usrUid)
+    {
+        $this->user = new Users();
+        $this->user->load($usrUid);
+        $this->drive->setDriveUser($this->user->getUsrEmail());
+    }
+
+    public  function loadApplication ($appUid)
+    {
+        $this->app = new Application();
+        $this->app->Load($appUid);
+    }
+
+    public function existAppFolderDrive ()
+    {
+        try {
+            if ($this->app->getAppDriveFolderUid() == null) {
+                $process = new Process();
+                $process->setProUid($this->app->getProUid());
+
+                $result = $this->drive->createFolder(
+                    $process->getProTitle() . ' - ' . G::LoadTranslation("ID_CASE") . ' #' . $this->app->getAppNumber(),
+                    $this->drive->getFolderIdPMDrive($this->user->getUsrUid())
+                );
+                $this->app->setAppDriveFolderUid($result->id);
+                $this->app->update($this->app->toArray(BasePeer::TYPE_FIELDNAME));
+            }
+        } catch (Exception $e) {
+            error_log('Error create folder Drive: ' . $e->getMessage());
+        }
+    }
+
+    public function permission ($appUid, $folderUid, $fileIdDrive)
+    {
+        $criteria = new Criteria('workflow');
+        $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
+        $criteria->addSelectColumn(TaskUserPeer::TAS_UID);
+        $criteria->addSelectColumn(TaskUserPeer::USR_UID);
+        $criteria->addSelectColumn(TaskUserPeer::TU_RELATION);
+
+        $criteria->add(ApplicationPeer::APP_UID, $appUid);
+        $criteria->addJoin(ApplicationPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN);
+        $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
+
+        $rs = ApplicationPeer::doSelectRS($criteria);
+        $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+        $userPermission = array();
+        $user = new Users();
+
+        while ($rs->next()) {
+            $row = $rs->getRow();
+            if ($row['TU_RELATION'] == 1) {
+                //users
+                $dataUser = $user->load($row['USR_UID']);
+                if (array_search($dataUser['USR_EMAIL'], $userPermission) === false) {
+                    $objectPermissions = $this->getAllObjects($row['PRO_UID'], $appUid, $row['TAS_UID'],
+                        $row['USR_UID']);
+                    $userPermission[] = $dataUser['USR_EMAIL'];
+                }
+            } else {
+                //Groups
+                $criteria = new Criteria('workflow');
+                $criteria->addSelectColumn(UsersPeer::USR_EMAIL);
+                $criteria->addSelectColumn(UsersPeer::USR_UID);
+                $criteria->add(GroupUserPeer::GRP_UID, $row['USR_UID']);
+                $criteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
+
+                $rsGroup = AppDelegationPeer::doSelectRS($criteria);
+                $rsGroup->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                while ($rsGroup->next()) {
+                    $aRow = $rsGroup->getRow();
+                    if (array_search($aRow['USR_EMAIL'], $userPermission) === false) {
+                        $objectPermissions = $this->getAllObjects($row['PRO_UID'], $appUid,
+                            $row['TAS_UID'], $aRow['USR_UID']);
+                        $userPermission[] = $aRow['USR_EMAIL'];
+                    }
+                }
+            }
+        }
+        $userPermission = array_unique($userPermission);
+
+        foreach ($userPermission as $key => $val) {
+            $this->drive->setPermission($folderUid, $val, 'user', 'writer');
+            $this->drive->setPermission($fileIdDrive, $val);
+        }
+    }
+
+    public function addUserEmail ($email)
+    {
+        if (empty($email)) {
+            return;
+        }
+        if ($this->usersEmail == '') {
+            $this->usersEmail = $email;
+        } else {
+            $emails = explode('|', $this->usersEmail);
+            if (array_search($email, $emails) === false) {
+                $this->usersEmail .= '|' . $email;
+            }
+        }
+    }
+    /**
+     * Get email of task users to app_uid
+     * @param $appUid id application
+     *
+     * @throws \Exception
+     */
+    public function getEmailUsersTask($appUid)
+    {
+        try {
+            $criteria = new Criteria('workflow');
+            $criteria->add(AppDelegationPeer::APP_UID, $appUid);
+            $criteria->add(AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN');
+
+            $rsAppDelegation = AppDelegationPeer::doSelectRS($criteria);
+            $rsAppDelegation->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+            $group = new Groups();
+            $user = new Users();
+            $data = [];
+            while ($rsAppDelegation->next()) {
+                $row = $rsAppDelegation->getRow();
+                if ($user->userExists($row['USR_UID'])) {
+                    $data = [];
+                    $data[] = $user->load($row['USR_UID']);
+                } else {
+                    $data = $group->getUsersOfGroup($row['USR_UID']);
+                }
+
+                foreach ($data as $dataUser) {
+                    $this->addUserEmail($dataUser["USR_EMAIL"]);
+                }
+            }
+        } catch (Exception $exception) {
+            error_log('Error: ' . $exception);
+        }
+    }
+
+    /**
+     * @param array $appDocument
+     * @param string $typeDocument type document INPUT, OUTPUT_DOC, OUTPUT_PDF, ATTACHED
+     * @param string $mime MIME type of the file to insert.
+     * @param string $src location of the file to insert.
+     * @param string $name Title of the file to insert, including the extension.
+     * return string uid
+     */
+    public function upload ($appDocument, $typeDocument, $mime, $src, $name)
+    {
+        try
+        {
+            $idFileDrive = null;
+            $this->existAppFolderDrive();
+            $appDoc = new AppDocument();
+            $result = $this->drive->uploadFile(
+                $mime,
+                $src,
+                $name,
+                $this->app->getAppDriveFolderUid()
+            );
+            if ($result->id !== null) {
+                $idFileDrive = $result->id;
+                $appDoc->setDriveDownload($typeDocument, $result->id);
+                $appDoc->update($appDocument);
+            }
+            return $idFileDrive;
+        } catch (Exception $e) {
+            error_log('Error upload file drive: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * Download file drive
+     * @param $uidFileDrive
+     */
+    public function download ($uidFileDrive)
+    {
+        try
+        {
+            $result = $this->drive->downloadFile($uidFileDrive);
+
+        } catch (Exception $e) {
+            error_log('Error Download file drive: ' . $e->getMessage());
+        }
+        return $result;
+    }
+
+
+    /**
+     * @param array $data
+     * @param string $typeDoc value INPUT, OUTPUT_DOC, OUTPUT_PDF, ATTACHED
+     *
+     * @return string url drive
+     */
+    public function changeUrlDrive ($data, $typeDoc)
+    {
+        try
+        {
+
+            $urlDrive = $data['APP_DOC_DRIVE_DOWNLOAD'];
+            if ($this->getStatusDrive()) {
+                $driveDownload = @unserialize($data['APP_DOC_DRIVE_DOWNLOAD']);
+                $urlDrive = $driveDownload !== false
+                && is_array($driveDownload)
+                && array_key_exists($typeDoc, $driveDownload) ?
+                    $driveDownload[$typeDoc] : $urlDrive;
+            }
+
+        } catch (Exception $e) {
+            error_log('Error change url drive: ' . $e->getMessage());
+        }
+
+        return $urlDrive;
+    }
+
+    /**
+     * Synchronize documents drive
+     *
+     * @param boolean $log enable print cron
+     */
+    public function synchronizeDrive ($log)
+    {
+        if (!$this->statusDrive) {
+            error_log("It has not enabled Feature Gmail");
+            return;
+        }
+        $criteria = new Criteria( 'workflow' );
+        $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
+        $criteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
+        $criteria->add(
+            $criteria->getNewCriterion( AppDocumentPeer::SYNC_WITH_DRIVE, 'UNSYNCHRONIZED', Criteria::EQUAL )->
+            addOr($criteria->getNewCriterion( AppDocumentPeer::SYNC_PERMISSIONS, null, Criteria::NOT_EQUAL ))
+        );
+
+        $criteria->addAscendingOrderByColumn( 'APP_DOC_CREATE_DATE' );
+        $criteria->addAscendingOrderByColumn( 'APP_UID' );
+        $rs = AppDocumentPeer::doSelectRS( $criteria );
+        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+
+        while ($rs->next()) {
+            $row = $rs->getRow();
+            $appDoc = new AppDocument();
+            $fields = $appDoc->load($row['APP_DOC_UID'], $row['DOC_VERSION']);
+
+            $appDocUid = $appDoc->getAppDocUid();
+            $docVersion = $appDoc->getDocVersion();
+            $filename = pathinfo( $appDoc->getAppDocFilename() );
+            $name = !empty($filename['basename'])? $filename['basename'] : '';
+            $ext = !empty($filename['extension'])? $filename['extension'] : '';
+            $appUid = G::getPathFromUID($appDoc->getAppUid());
+            $file = G::getPathFromFileUID($appDoc->getAppUid(), $appDocUid );
+
+
+            $sw_file_exists_doc = false;
+            $sw_file_exists_pdf = false;
+            if ($appDoc->getAppDocType() == 'OUTPUT') {
+                //$name = substr($name, 1, -1);
+                $realPathDoc = PATH_DOCUMENT . $appUid . '/outdocs/' . $appDocUid . '_' . $docVersion . '.' . 'doc';
+                $realPathDoc1 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '_' . $docVersion . '.' . 'doc';
+                $realPathDoc2 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '.' . 'doc';
+
+                $sw_file_exists = false;
+                if (file_exists( $realPathDoc )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_doc = true;
+                } elseif (file_exists( $realPathDoc1 )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_doc = true;
+                    $realPathDoc = $realPathDoc1;
+                } elseif (file_exists( $realPathDoc2 )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_doc = true;
+                    $realPathDoc = $realPathDoc2;
+                }
+
+                $realPathPdf = PATH_DOCUMENT . $appUid . '/outdocs/' . $appDocUid . '_' . $docVersion . '.' . 'pdf';
+                $realPathPdf1 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '_' .$docVersion . '.' . 'pdf';
+                $realPathPdf2 = PATH_DOCUMENT . $appUid . '/outdocs/' . $name . '.' . 'pdf';
+
+                if (file_exists( $realPathPdf )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_pdf = true;
+                } elseif (file_exists( $realPathPdf1 )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_pdf = true;
+                    $realPathPdf = $realPathPdf1;
+                } elseif (file_exists( $realPathPdf2 )) {
+                    $sw_file_exists = true;
+                    $sw_file_exists_pdf = true;
+                    $realPathPdf = $realPathPdf2;
+                }
+            } else {
+                $realPath = PATH_DOCUMENT .  $appUid . '/' . $file[0] . $file[1] . '_' . $docVersion . '.' . $ext;
+                $realPath1 = PATH_DOCUMENT . $appUid . '/' . $file[0] . $file[1] . '.' . $ext;
+                $sw_file_exists = false;
+                if (file_exists( $realPath )) {
+                    $sw_file_exists = true;
+                } elseif (file_exists( $realPath1 )) {
+                    $sw_file_exists = true;
+                    $realPath = $realPath1;
+                }
+            }
+            if ($sw_file_exists) {
+
+                $this->loadApplication($appDoc->getAppUid());
+                $this->loadUser($fields['USR_UID']);
+
+                $emails = $appDoc->getSyncPermissions();
+                $emails = !empty($emails) ? explode('|', $emails) : array();
+                $result = null;
+                foreach ($emails as $index => $email) {
+                    if (!empty($email)) {
+
+                        if ($index == 0 && $fields['SYNC_WITH_DRIVE'] == 'UNSYNCHRONIZED') {
+                            if ($log) {
+                                eprintln('upload file:' .  $name , 'green');
+                            }
+                            $this->drive->setDriveUser($email);
+                            $info = finfo_open(FILEINFO_MIME_TYPE);
+                            $mime = finfo_file($info, $realPath);
+                            $type = $appDoc->getAppDocType();
+
+                            if ($appDoc->getAppDocType() == 'OUTPUT') {
+
+                                if ($sw_file_exists_doc) {
+                                    $realPath = $realPathDoc;
+                                    $name = array_pop(explode('/', $realPathDoc));
+                                    $mime = 'application/msword';
+                                    $type = 'OUTPUT_DOC';
+                                }
+                                if ($sw_file_exists_pdf) {
+                                    $realPath = $realPathPdf;
+                                    $name = array_pop(explode('/', $realPathPdf));
+                                    $mime = finfo_file($info, $realPathPdf);
+                                    $type = 'OUTPUT_PDF';
+                                }
+                            }
+                            $result = $this->upload($fields, $type, $mime, $realPath, $name);
+                        } else {
+                            $this->drive->setDriveUser($this->user->getUsrEmail());
+                        }
+                        if ($log) {
+                            eprintln('Set Permission:' .  $email , 'green');
+                        }
+                        $this->drive->setPermission($this->app->getAppDriveFolderUid(), $email, 'user', 'writer');
+
+                    }
+                }
+                if ($result != null) {
+                    $fields['SYNC_WITH_DRIVE'] = 'SYNCHRONIZED';
+                    $fields['SYNC_PERMISSIONS'] = null;
+                }
+            } else {
+                $fields['SYNC_WITH_DRIVE'] = 'NO_EXIST_FILE_PM';
+                if ($log) {
+                    eprintln('File no exists:' . $name , 'red');
+                }
+            }
+            $appDoc->update($fields);
+        }
+    }
+
+    public function addUsersDocumentDrive ($appUid)
+    {
+        $this->getEmailUsersTask($appUid);
+
+        $criteria = new Criteria( 'workflow' );
+        $criteria->add( AppDocumentPeer::APP_UID, $appUid );
+        $criteria->addAscendingOrderByColumn( 'DOC_VERSION' );
+        $rs = AppDocumentPeer::doSelectRS( $criteria );
+        $rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
+
+        $appDoc = new AppDocument();
+        while ($rs->next()) {
+            $row = $rs->getRow();
+            if (empty($row['SYNC_PERMISSIONS'])) {
+                $row['SYNC_PERMISSIONS'] =  $this->usersEmail;
+            } else {
+                $emails = explode('|', $row['SYNC_PERMISSIONS']);
+                foreach ($emails as $email) {
+                    $this->addUserEmail($email);
+                }
+            }
+            $appDoc->update($row);
+        }
+    }
+}

workflow/engine/classes/class.case.php

@@ -3640,15 +3640,6 @@ class Cases
                 'APP_DOC_FILENAME' => 'char',
                 'APP_DOC_INDEX' => 'integer'
             );
-            /*----------------------------------********---------------------------------*/
-            $licensedFeatures = &PMLicensedFeatures::getSingleton();
-            $enablePMGmail = false;
-            if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                G::LoadClass( "pmDrive" );
-                $pmDrive = new PMDrive();
-                $enablePMGmail = $pmDrive->getStatusService();
-            }
-            /*----------------------------------********---------------------------------*/
 
             while ($aRow = $oDataset->getRow()) {
                 $aAux = $oAppDocument->load($aRow['APP_DOC_UID'], $aRow['DOC_VERSION']);
@@ -3709,15 +3700,6 @@ class Cases
                     }
                 }
                 $aFields['COMMENT'] = $aFields['APP_DOC_COMMENT'];
-                /*----------------------------------********---------------------------------*/
-                //change donwload link - drive
-                $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                        $driveDownload) && $enablePMGmail
-                ) {
-                    $aFields['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-                }
-                /*----------------------------------********---------------------------------*/
                 if (($aRow['DOC_VERSION'] == $lastVersion) || ($sAppDocuUID != "")) {
                     $aInputDocuments[] = $aFields;
                 }
@@ -3942,93 +3924,6 @@ class Cases
         $strPathName = PATH_DOCUMENT . G::getPathFromUID($applicationUid) . PATH_SEP;
         $strFileName = $appDocUid . "_" . $docVersion . "." . $extension;
 
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            if ($pmDrive->getStatusService()) {
-                $app = new Application();
-                $user = new Users();
-                $dataUser = $user->load($userUid);
-                $pmDrive->setDriveUser($dataUser['USR_EMAIL']);
-
-                $appData = $app->Load($applicationUid);
-                if ($appData['APP_DRIVE_FOLDER_UID'] == null) {
-                    $process = new Process();
-                    $process->setProUid($appData['PRO_UID']);
-
-                    $result = $pmDrive->createFolder($process->getProTitle() . ' - ' . G::LoadTranslation("ID_CASE") . ' #' . $appData['APP_NUMBER'],
-                        $pmDrive->getFolderIdPMDrive($userUid));
-                    $appData['APP_DRIVE_FOLDER_UID'] = $result->id;
-                    $app->update($appData);
-                }
-
-                $result = $pmDrive->uploadFile('application/' . $extension, $fileTmpName, $file,
-                    $appData['APP_DRIVE_FOLDER_UID']);
-                $appDocument->setDriveDownload('INPUT', $result->webContentLink);
-                $fileIdDrive = $result->id;
-                $arrayField['DOC_VERSION'] = $docVersion;
-                $arrayField['APP_DOC_UID'] = $appDocUid;
-
-                $appDocument->update($arrayField);
-
-                //add permissions
-                $criteria = new Criteria('workflow');
-                $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
-                $criteria->addSelectColumn(TaskUserPeer::TAS_UID);
-                $criteria->addSelectColumn(TaskUserPeer::USR_UID);
-                $criteria->addSelectColumn(TaskUserPeer::TU_RELATION);
-
-                $criteria->add(ApplicationPeer::APP_UID, $applicationUid);
-                $criteria->addJoin(ApplicationPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN);
-                $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
-
-                $dataset = ApplicationPeer::doSelectRS($criteria);
-                $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
-                $userPermission = array();
-
-                while ($dataset->next()) {
-                    $row = $dataset->getRow();
-                    if ($row['TU_RELATION'] == 1) {
-                        //users
-                        $dataUser = $user->load($row['USR_UID']);
-                        if (array_search($dataUser['USR_EMAIL'], $userPermission) === false) {
-                            $objectPermissions = $this->getAllObjects($row['PRO_UID'], $applicationUid, $row['TAS_UID'],
-                                $row['USR_UID']);
-                            $userPermission[] = $dataUser['USR_EMAIL'];
-                        }
-                    } else {
-                        //Groups
-                        $criteria = new Criteria('workflow');
-                        $criteria->addSelectColumn(UsersPeer::USR_EMAIL);
-                        $criteria->addSelectColumn(UsersPeer::USR_UID);
-                        $criteria->add(GroupUserPeer::GRP_UID, $row['USR_UID']);
-                        $criteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
-
-                        $oDataset = AppDelegationPeer::doSelectRS($criteria);
-                        $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                        while ($oDataset->next()) {
-                            $aRow = $oDataset->getRow();
-                            if (array_search($aRow['USR_EMAIL'], $userPermission) === false) {
-                                $objectPermissions = $this->getAllObjects($row['PRO_UID'], $applicationUid,
-                                    $row['TAS_UID'], $aRow['USR_UID']);
-                                $userPermission[] = $aRow['USR_EMAIL'];
-                            }
-                        }
-                    }
-                }
-                $userPermission = array_unique($userPermission);
-
-                foreach ($userPermission as $key => $val) {
-                    $pmDrive->setPermission($appData['APP_DRIVE_FOLDER_UID'], $val, 'user', 'writer');
-                    $pmDrive->setPermission($fileIdDrive, $val);
-                }
-            }
-        }
-        /*----------------------------------********---------------------------------*/
-
         switch ($option) {
             case "xmlform":
                 G::uploadFile($fileTmpName, $strPathName, $strFileName);
@@ -4228,19 +4123,6 @@ class Cases
         $oListPaused = new ListPaused();
         $oListPaused->create($data);
         /*----------------------------------********---------------------------------*/
-
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-            if (!empty($enablePMGmail) && $enablePMGmail == 1) {
-                $pmGmail = new \ProcessMaker\BusinessModel\Pmgmail();
-                $pmGmail->modifyMailToPauseCase($aData['APP_UID'], $aData['APP_DEL_INDEX']);
-            }
-        }
-        /*----------------------------------********---------------------------------*/
     }
 
     /*
@@ -4337,19 +4219,6 @@ class Cases
         $oListPaused = new ListPaused();
         $oListPaused->remove($sApplicationUID, $iDelegation, $aData);
         /*----------------------------------********---------------------------------*/
-
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-            if (!empty($enablePMGmail) && $enablePMGmail == 1) {
-                $pmGmail = new \ProcessMaker\BusinessModel\Pmgmail();
-                $pmGmail->modifyMailToUnpauseCase($aData['APP_UID'], $aData['DEL_INDEX']);
-            }
-        }
-        /*----------------------------------********---------------------------------*/
     }
 
     /*
@@ -4729,15 +4598,6 @@ class Cases
             'APP_DOC_FILENAME' => 'char', 'APP_DOC_INDEX' => 'integer'
         );
         $oUser = new Users();
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        $enablePMGmail = false;
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-        }
-        /*----------------------------------********---------------------------------*/
         while ($aRow = $oDataset->getRow()) {
             $oCriteria2 = new Criteria('workflow');
             $oCriteria2->add(AppDelegationPeer::APP_UID, $sApplicationUID);
@@ -4798,15 +4658,6 @@ class Cases
                     }
                 }
             }
-            /*----------------------------------********---------------------------------*/
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -4884,15 +4735,6 @@ class Cases
 
             $aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_DOWNLOAD');
             $aFields['DOWNLOAD_LINK'] = "cases_ShowDocument?a=" . $aRow['APP_DOC_UID'];
-            /*----------------------------------********---------------------------------*/
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['ATTACHED'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -4960,15 +4802,6 @@ class Cases
                     }
                 }
             }
-            /*----------------------------------********---------------------------------*/
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -5076,15 +4909,6 @@ class Cases
             'APP_DOC_INDEX' => 'integer'
         );
         $oUser = new Users();
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        $enablePMGmail = false;
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-        }
-        /*----------------------------------********---------------------------------*/
         while ($aRow = $oDataset->getRow()) {
             $oCriteria2 = new Criteria('workflow');
             $oCriteria2->add(AppDelegationPeer::APP_UID, $sApplicationUID);
@@ -5188,21 +5012,6 @@ class Cases
                     $firstDocLabel = $fileDocLabel;
                 }
 
-                /*----------------------------------********---------------------------------*/
-                //change donwload link - drive
-                $driveDownload = @unserialize($aAux['APP_DOC_DRIVE_DOWNLOAD']);
-                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_DOC',
-                        $driveDownload) && $enablePMGmail
-                ) {
-                    $fileDoc = $driveDownload['OUTPUT_DOC'];
-                }
-                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_PDF',
-                        $driveDownload) && $enablePMGmail
-                ) {
-                    $filePdf = $driveDownload['OUTPUT_PDF'];
-                }
-                /*----------------------------------********---------------------------------*/
-
                 $aFields = array(
                     'APP_DOC_UID' => $aAux['APP_DOC_UID'],
                     'DOC_UID' => $aAux['DOC_UID'],

workflow/engine/classes/class.labelsGmail.php

@@ -1,4 +1,6 @@
 <?php
+require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient' . PATH_SEP . 'src' . PATH_SEP . 'Google' . PATH_SEP . 'autoload.php';
+G::LoadClass("pmGoogleApi");
 
 class labelsGmail
 {
@@ -12,6 +14,7 @@ class labelsGmail
             }
         } catch (Exception $e) {
             print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
+            throw ($e);
         }
         return $labels;
     }
@@ -19,14 +22,15 @@ class labelsGmail
     /**
      * Modify the Labels a Message is associated with.
      *
-     * @param  Google_Service_Gmail $service Authorized Gmail API instance.
+     * @param  Google_Service_Gmail $service        Authorized Gmail API instance.
-     * @param  string $userId User's email address. The special value 'me'
+     * @param  string               $userId         User's email address. The special value 'me'
-     * can be used to indicate the authenticated user.
+     *                                              can be used to indicate the authenticated user.
-     * @param  string $messageId ID of Message to modify.
+     * @param  string               $messageId      ID of Message to modify.
-     * @param  array $labelsToAdd Array of Labels to add.
+     * @param  array                $labelsToAdd    Array of Labels to add.
-     * @param  array $labelsToRemove Array of Labels to remove.
+     * @param  array                $labelsToRemove Array of Labels to remove.
      */
-    function modifyMessage($service, $userId, $messageId, $labelsToAdd, $labelsToRemove) {
+    function modifyMessage($service, $userId, $messageId, $labelsToAdd, $labelsToRemove)
+    {
         $mods = new Google_Service_Gmail_ModifyMessageRequest();
         $mods->setAddLabelIds($labelsToAdd);
         $mods->setRemoveLabelIds($labelsToRemove);
@@ -34,6 +38,7 @@ class labelsGmail
             $message = $service->users_messages->modify($userId, $messageId, $mods);
         } catch (Exception $e) {
             print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
+            throw ($e);
         }
     }
 
@@ -41,12 +46,14 @@ class labelsGmail
      * Get list of Messages in user's mailbox.
      *
      * @param  Google_Service_Gmail $service Authorized Gmail API instance.
-     * @param  string $userId User's email address. The special value 'me'
+     * @param  string               $userId  User's email address. The special value 'me'
-     * can be used to indicate the authenticated user.
+     *                                       can be used to indicate the authenticated user.
+     *
      * @return array Array of Messages.
      */
-    function listMessages($service, $userId, $query, $labels) {
+    function listMessages($service, $userId, $query, $labels)
-        $pageToken = NULL;
+    {
+        $pageToken = null;
         $messages = array();
         $opt_param = array();
         do {
@@ -63,71 +70,19 @@ class labelsGmail
                 }
             } catch (Exception $e) {
                 print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
+                throw ($e);
             }
         } while ($pageToken);
 
         return $messages;
     }
 
-   public function setLabelsToPauseCase ($caseId, $index) {
+    public function setLabelsToPauseCase($caseId, $index)
-       require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient' . PATH_SEP . 'src' . PATH_SEP . 'Google' . PATH_SEP . 'autoload.php';
+    {
-       require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.pmGoogleApi.php");
-
-       $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
-       $appData = $Pmgmail->getDraftApp($caseId, $index);
-
-       foreach ($appData as $application){
-           $appNumber = $application['APP_NUMBER'];
-           $index = $application['DEL_INDEX'];
-           $threadUsr = $application['USR_UID'];
-           $proName = $application['APP_PRO_TITLE'];
-           $threadStatus = $application['DEL_THREAD_STATUS'];
-           $appStatus = $application['APP_STATUS'];
-       }
-
-       //Getting the privious User email
-       $oUsers = new \Users();
-       $usrData = $oUsers->loadDetails($threadUsr);
-       $mail = $usrData['USR_EMAIL'];
-
-       //The Subject to search the email
-       $subject = "[PM] " .$proName. " Case: ". $appNumber;
-
-       $pmGoogle = new PMGoogleApi();
-       $pmGoogle->setUser($mail);
-       $pmGoogle->setScope('https://www.googleapis.com/auth/gmail.modify');
-       $client = $pmGoogle->serviceClient();
-       $service = new Google_Service_Gmail($client);
-       $labelsIds = $this->getLabelsIds($service);
-
-       if($appStatus == 'DRAFT'){
-           $labelsToRemove = $labelsIds['Draft'];
-           $labelsToSearch = "*-draft";
-           $labelsToAdd = $labelsIds['Paused'];
-       }
-
-       if($appStatus == 'TO_DO'){
-           $labelsToRemove = $labelsIds['Inbox'];
-           $labelsToSearch = "*-inbox";
-           $labelsToAdd = $labelsIds['Paused'];
-       }
-
-       $q = "subject:('".preg_quote($subject, '-')."') label:('".$labelsToSearch."')";
-       $messageList = $this->listMessages($service, $mail, $q, $labelsToRemove);
-       foreach ($messageList as $message) {
-           $messageId = $message->getId();
-           $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd), array($labelsToRemove));
-       }
-   }
-
-    function setLabelsTounpauseCase ($caseId, $index) {
-        require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient' . PATH_SEP . 'src' . PATH_SEP . 'Google' . PATH_SEP . 'autoload.php';
-        require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.pmGoogleApi.php");
-
         $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
         $appData = $Pmgmail->getDraftApp($caseId, $index);
 
-        foreach ($appData as $application){
+        foreach ($appData as $application) {
             $appNumber = $application['APP_NUMBER'];
             $index = $application['DEL_INDEX'];
             $threadUsr = $application['USR_UID'];
@@ -142,41 +97,42 @@ class labelsGmail
         $mail = $usrData['USR_EMAIL'];
 
         //The Subject to search the email
-        $subject = "[PM] " .$proName. " Case: ". $appNumber;
+        $subject = "[PM] " . $proName . " Case: " . $appNumber;
 
         $pmGoogle = new PMGoogleApi();
         $pmGoogle->setUser($mail);
-        $pmGoogle->setScope('https://www.googleapis.com/auth/gmail.modify');
+        $pmGoogle->setScope(PMGoogleApi::GMAIL_MODIFY);
         $client = $pmGoogle->serviceClient();
         $service = new Google_Service_Gmail($client);
         $labelsIds = $this->getLabelsIds($service);
 
-        if($appStatus == 'DRAFT'){
+        if ($appStatus == 'DRAFT') {
-            $labelsToRemove = $labelsIds['Paused'];
+            $labelsToRemove = $labelsIds['Draft'];
-            $labelsToSearch = "*-paused";
+            $labelsToSearch = "*-draft";
-            $labelsToAdd = $labelsIds['Draft'];
+            $labelsToAdd = $labelsIds['Paused'];
         }
 
-        if($appStatus == 'TO_DO'){
+        if ($appStatus == 'TO_DO') {
-            $labelsToRemove = $labelsIds['Paused'];
+            $labelsToRemove = $labelsIds['Inbox'];
-            $labelsToSearch = "*-paused";
+            $labelsToSearch = "*-inbox";
-            $labelsToAdd = $labelsIds['Inbox'];
+            $labelsToAdd = $labelsIds['Paused'];
         }
 
-        $q = "subject:('".preg_quote($subject, '-')."') label:('".$labelsToSearch."')";
+        $q = "subject:('" . preg_quote($subject, '-') . "') label:('" . $labelsToSearch . "')";
         $messageList = $this->listMessages($service, $mail, $q, $labelsToRemove);
         foreach ($messageList as $message) {
             $messageId = $message->getId();
-            $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd), array($labelsToRemove));
+            $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd),
+                array($labelsToRemove));
         }
     }
 
-   public function setLabels($caseId, $index, $actualLastIndex, $unassigned=false){
+    function setLabelsTounpauseCase($caseId, $index)
-        //First getting the actual thread data
+    {
         $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
         $appData = $Pmgmail->getDraftApp($caseId, $index);
 
-        foreach ($appData as $application){
+        foreach ($appData as $application) {
             $appNumber = $application['APP_NUMBER'];
             $index = $application['DEL_INDEX'];
             $threadUsr = $application['USR_UID'];
@@ -185,7 +141,59 @@ class labelsGmail
             $appStatus = $application['APP_STATUS'];
         }
 
-        if($threadStatus == 'CLOSED' || $unassigned == true) {
+        //Getting the privious User email
+        $oUsers = new \Users();
+        $usrData = $oUsers->loadDetails($threadUsr);
+        $mail = $usrData['USR_EMAIL'];
+
+        //The Subject to search the email
+        $subject = "[PM] " . $proName . " Case: " . $appNumber;
+
+        $pmGoogle = new PMGoogleApi();
+        $pmGoogle->setUser($mail);
+        $pmGoogle->setScope(PMGoogleApi::GMAIL_MODIFY);
+        $client = $pmGoogle->serviceClient();
+        $service = new Google_Service_Gmail($client);
+        $labelsIds = $this->getLabelsIds($service);
+
+        if ($appStatus == 'DRAFT') {
+            $labelsToRemove = $labelsIds['Paused'];
+            $labelsToSearch = "*-paused";
+            $labelsToAdd = $labelsIds['Draft'];
+        }
+
+        if ($appStatus == 'TO_DO') {
+            $labelsToRemove = $labelsIds['Paused'];
+            $labelsToSearch = "*-paused";
+            $labelsToAdd = $labelsIds['Inbox'];
+        }
+
+        $q = "subject:('" . preg_quote($subject, '-') . "') label:('" . $labelsToSearch . "')";
+        $messageList = $this->listMessages($service, $mail, $q, $labelsToRemove);
+        foreach ($messageList as $message) {
+            $messageId = $message->getId();
+            $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd),
+                array($labelsToRemove));
+        }
+    }
+
+    public function setLabels($caseId, $index, $actualLastIndex, $unassigned = false)
+    {
+        //First getting the actual thread data
+        $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
+        $appData = $Pmgmail->getDraftApp($caseId, $index);
+
+        foreach ($appData as $application) {
+            $appNumber = $application['APP_NUMBER'];
+            $index = $application['DEL_INDEX'];
+            $threadUsr = $application['USR_UID'];
+            $proName = $application['APP_PRO_TITLE'];
+            $threadStatus = $application['DEL_THREAD_STATUS'];
+            $appStatus = $application['APP_STATUS'];
+            $tasUid = $application['TAS_UID'];
+        }
+
+        if ($threadStatus == 'CLOSED' || $unassigned == true) {
             //Getting the privious User email
             $oUsers = new \Users();
 
@@ -193,125 +201,215 @@ class labelsGmail
             $mail = $usrData['USR_EMAIL'];
 
             //The Subject to search the email
-            $subject = "[PM] " .$proName. " Case: ". $appNumber;
+            $subject = "[PM] " . $proName . " Case: " . $appNumber;
 
-            require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient' . PATH_SEP . 'src' . PATH_SEP . 'Google' . PATH_SEP . 'autoload.php';
-            require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.pmGoogleApi.php");
             $pmGoogle = new PMGoogleApi();
 
             $pmGoogle->setUser($mail);
 
-            $pmGoogle->setScope('https://www.googleapis.com/auth/gmail.modify');
+            $pmGoogle->setScope(PMGoogleApi::GMAIL_MODIFY);
             $client = $pmGoogle->serviceClient();
 
             $service = new Google_Service_Gmail($client);
             $labelsIds = $this->getLabelsIds($service);
 
-            if($actualLastIndex == 0){
+            if ($actualLastIndex == 0) {
                 $labelsToRemove = $labelsIds['Draft'];
                 $labelsToSearch = "*-draft";
                 $labelsToAdd = $labelsIds['Participated'];
-            } else if ( ($actualLastIndex == -1) && ($unassigned == true) ){ //Unassigned
+            } else {
-                $labelsToRemove = $labelsIds['Unassigned'];
+                if (($actualLastIndex == -1) && ($unassigned == true)) { //Unassigned
-                $labelsToSearch = "*-unassigned";
+                    $labelsToRemove = $labelsIds['Unassigned'];
-                $labelsToAdd = $labelsIds['Inbox'];
+                    $labelsToSearch = "*-unassigned";
-            } else if($actualLastIndex >= 1) {
+                    $labelsToAdd = $labelsIds['Inbox'];
-                $labelsToRemove = $labelsIds['Inbox'];
+                } else {
-                $labelsToSearch = "*-inbox";
+                    if ($actualLastIndex >= 1) {
-                $labelsToAdd = $labelsIds['Participated'];
+                        $labelsToRemove = $labelsIds['Inbox'];
+                        $labelsToSearch = "*-inbox";
+                        $labelsToAdd = $labelsIds['Participated'];
+                    }
+                }
             }
 
             //Searching the email in the user's mail
-            $q = "subject:('".preg_quote($subject, '-')."') label:('".$labelsToSearch."')";
+            $q = "subject:('" . preg_quote($subject, '-') . "') label:('" . $labelsToSearch . "')";
-
             $messageList = $this->listMessages($service, $mail, $q, $labelsToRemove);
 
             foreach ($messageList as $message) {
                 $messageId = $message->getId();
 
-                $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd), array($labelsToRemove));
+                $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd),
+                    array($labelsToRemove));
 
             }
+
+            //in is unassigned we must remove the label to the orher users
+            if ($labelsToRemove === $labelsIds['Unassigned']) {
+                require_once(PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "TaskUser.php");
+                $oTaskUsers = new \TaskUser();
+                $taskUsers = $oTaskUsers->getAllUsersTask($tasUid);
+                foreach ($taskUsers as $user) {
+                    $usrData = $oUsers->loadDetails($user['USR_UID']);
+                    $nextMail = $usrData['USR_EMAIL'];
+                    //this operation is just for the users that didn't make the case claim
+                    if ($nextMail !== $mail) {
+                        $this->changeLabelsOfUnassigned($appData[0], $nextMail);
+                    }
+                }
+            }
         }
     }
-    
+
+    function changeLabelsOfUnassigned($application, $mail)
+    {
+        $appNumber = $application['APP_NUMBER'];
+        $index = $application['DEL_INDEX'];
+        $threadUsr = $application['USR_UID'];
+        $proName = $application['APP_PRO_TITLE'];
+        $threadStatus = $application['DEL_THREAD_STATUS'];
+        $appStatus = $application['APP_STATUS'];
+        $tasUid = $application['TAS_UID'];
+
+        //The Subject to search the email
+        $subject = "[PM] " . $proName . " Case: " . $appNumber;
+        $pmGoogle = new PMGoogleApi();
+        $pmGoogle->setUser($mail);
+        $pmGoogle->setScope(PMGoogleApi::GMAIL_MODIFY);
+        $client = $pmGoogle->serviceClient();
+        $service = new Google_Service_Gmail($client);
+        $labelsIds = $this->getLabelsIds($service);
+        $labelsToRemove = $labelsIds['Unassigned'];
+        $labelsToSearch = "*-unassigned";
+        $labelsToAdd = $labelsIds['Participated'];
+
+        //Searching the email in the user's mail
+        $q = "subject:('" . preg_quote($subject, '-') . "') label:('" . $labelsToSearch . "')";
+        $messageList = $this->listMessages($service, $mail, $q, $labelsToRemove);
+
+        foreach ($messageList as $message) {
+            $messageId = $message->getId();
+            $modifyResult = $this->modifyMessage($service, $mail, $messageId, array($labelsToAdd),
+                array($labelsToRemove));
+
+        }
+    }
+
+
     /**
      * Delete Label with given ID.
      *
      * @param  Google_Service_Gmail $service Authorized Gmail API instance.
-     * @param  string $userId User's email address. The special value 'me'
+     * @param  string               $userId  User's email address. The special value 'me'
-     * can be used to indicate the authenticated user.
+     *                                       can be used to indicate the authenticated user.
-     * @param  string $labelId Id of Label to be updated.
+     * @param  string               $labelId Id of Label to be updated.
      */
     public function deleteLabel($service, $user, $labelId)
     {
-    	try {
+        try {
-    		$service->users_labels->delete($user, $labelId);
+            $service->users_labels->delete($user, $labelId);
-    	} catch (Exception $e) {
+        } catch (Exception $e) {
-    		error_log(G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage());
+            error_log(G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage());
-    	}
+        }
     }
-    
+
     /**
      * Delete PMGmail integration labels getting the list of labels in an email account.
+     *
      * @param string $mail User mail adress.
      *
      */
     public function deletePMGmailLabels($mail)
     {
-    	require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.pmGoogleApi.php");
+        $pmGoogle = new PMGoogleApi();
-    	$pmGoogle = new PMGoogleApi();
-    
-    	$pmGoogle->setUser($mail);
-    
-    	$pmGoogle->setScope('https://www.googleapis.com/auth/gmail.modify');
-    	$client = $pmGoogle->serviceClient();
-    
-    	$service = new Google_Service_Gmail($client);
-    	$count = 0;
-    	$listlabels = $this->listLabels($service);
-    	foreach ($listlabels as $label) {
-    		if ($label->getName() == '* Inbox' ||
-    				$label->getName() == '* Participated' ||
-    				$label->getName() == '* Unassigned' ||
-    				$label->getName() == '* Draft' ||
-    				$label->getName() == '* Inbox' ||
-    				$label->getName() == '*-- ProcessMaker --*' ||
-    				$label->getName() == '* Paused'
-    		) {
-    			$oresp = $this->deleteLabel($service, 'me', $label->getId());
-    			$count++;
-    		}
-    	}
-    	return $count . ' labels successfully deleted.';
-    }
 
+        $pmGoogle->setUser($mail);
 
-    private function getLabelsIds($service) {
+        $pmGoogle->setScope(PMGoogleApi::GMAIL_MODIFY);
-        $result = array();
+        $client = $pmGoogle->serviceClient();
+
+        $service = new Google_Service_Gmail($client);
+        $count = 0;
         $listlabels = $this->listLabels($service);
         foreach ($listlabels as $label) {
-            $labId =  $label->getId();
+            if ($label->getName() == '* Inbox' ||
-            $labName = $label->getName();
+                $label->getName() == '* Participated' ||
-            switch($labName){
+                $label->getName() == '* Unassigned' ||
-                case "* Inbox":
+                $label->getName() == '* Draft' ||
-                    $result['Inbox'] = $labId;
+                $label->getName() == '* Inbox' ||
-                    break;
+                $label->getName() == '* --- ProcessMaker ---' ||
-                case "* Participated":
+                $label->getName() == '* Paused'
-                    $result['Participated'] = $labId;
+            ) {
-                    break;
+                $oresp = $this->deleteLabel($service, 'me', $label->getId());
-                case "* Unassigned":
+                $count++;
-                    $result['Unassigned'] = $labId;
-                    break;
-                case "* Draft":
-                    $result['Draft'] = $labId;
-                    break;
-                case "* Paused":
-                    $result['Paused'] = $labId;
-                    break;
             }
         }
+        return $count . ' labels successfully deleted.';
+    }
+
+    public function addRelabelingToQueue($caseId, $index, $actualLastIndex, $unassigned = false)
+    {
+        $labelingQueue = new GmailRelabeling();
+        $labelingQueue->setCreateDate(date('Y-m-d H:i:s'));
+        $labelingQueue->setLabelingUid(G::generateUniqueID());
+        $labelingQueue->setAppUid($caseId);
+        $labelingQueue->setDelIndex($index);
+        $labelingQueue->setCurrentLastIndex($actualLastIndex);
+        $labelingQueue->setUnassigned(($unassigned === true) ? 1 : 0);
+        $labelingQueue->setStatus('pending');
+        $labelingQueue->save();
+    }
+
+    public function processPendingRelabelingInQueue()
+    {
+        $c = new \Criteria('workflow');
+        $c->add(\GmailRelabelingPeer::STATUS, 'pending');
+        $c->addAscendingOrderByColumn('CREATE_DATE');
+        $list = \GmailRelabelingPeer::doSelect($c);
+        foreach ($list as $task) {
+            try {
+                $oResponse = $this->setLabels($task->getAppUid(),
+                    $task->getDelIndex(),
+                    $task->getCurrentLastIndex(),
+                    ($task->getUnassigned() === 1) ? true : false
+                );
+                $task->setStatus('completed');
+            } catch (exception $e) {
+                $task->setMsgError($e->getMessage());
+                $task->setStatus('pending');
+            }
+            $task->save();
+        }
+    }
+
+    private function getLabelsIds($service)
+    {
+        $result = array();
+        try {
+            $listlabels = $this->listLabels($service);
+            foreach ($listlabels as $label) {
+                $labId = $label->getId();
+                $labName = $label->getName();
+                switch ($labName) {
+                    case "* Inbox":
+                        $result['Inbox'] = $labId;
+                        break;
+                    case "* Participated":
+                        $result['Participated'] = $labId;
+                        break;
+                    case "* Unassigned":
+                        $result['Unassigned'] = $labId;
+                        break;
+                    case "* Draft":
+                        $result['Draft'] = $labId;
+                        break;
+                    case "* Paused":
+                        $result['Paused'] = $labId;
+                        break;
+                }
+            }
+        } catch (Exception $e) {
+            throw $e;
+        }
         return $result;
     }
 }
-

workflow/engine/classes/class.pmDrive.php

@@ -94,12 +94,13 @@ class PMDrive extends PMGoogleApi
      */
     public function listFolder($fileId)
     {
-        $this->setScope('https://www.googleapis.com/auth/drive');
+        $this->setScope(static::DRIVE);
-        $this->setScope('https://www.googleapis.com/auth/drive.file');
+        $this->setScope(static::DRIVE_FILE);
-        $this->setScope('https://www.googleapis.com/auth/drive.readonly');
+        $this->setScope(static::DRIVE_READONLY);
-        $this->setScope('https://www.googleapis.com/auth/drive.metadata.readonly');
+        $this->setScope(static::DRIVE_METADATA);
-        $this->setScope('https://www.googleapis.com/auth/drive.appdata');
+        $this->setScope(static::DRIVE_METADATA_READONLY);
-        $this->setScope('https://www.googleapis.com/auth/drive.metadata');
+        $this->setScope(static::DRIVE_APPDATA);
+        
         $service = $this->serviceDrive();
 
         try {
@@ -126,7 +127,7 @@ class PMDrive extends PMGoogleApi
      */
     public function createFolder($name, $parentId = null)
     {
-        $this->setScope('https://www.googleapis.com/auth/drive.file');
+        $this->setScope(static::DRIVE_FILE);
 
         $service = $this->serviceDrive();
 
@@ -159,12 +160,12 @@ class PMDrive extends PMGoogleApi
      */
     public function uploadFile($mime, $src, $name, $parentId = null)
     {
-        $this->setScope('https://www.googleapis.com/auth/drive.file');
+        $this->setScope(static::DRIVE_FILE);
 
         $service = $this->serviceDrive();
 
         $file = new Google_Service_Drive_DriveFile();
-        $file->setMimeType("*/*");
+        $file->setMimeType($mime);
         $file->setTitle($name);
 
         // Set the parent folder.
@@ -200,25 +201,24 @@ class PMDrive extends PMGoogleApi
      */
     public function downloadFile($fileId)
     {
-        $this->setScope('https://www.googleapis.com/auth/drive');
+        $this->setScope(static::DRIVE);
-        $this->setScope('https://www.googleapis.com/auth/drive.appdata');
+        $this->setScope(static::DRIVE_APPDATA);
-        $this->setScope('https://www.googleapis.com/auth/drive.apps.readonly');
+        $this->setScope(static::DRIVE_APPS_READONLY);
-        $this->setScope('https://www.googleapis.com/auth/drive.file');
+        $this->setScope(static::DRIVE_FILE);
-        $this->setScope('https://www.googleapis.com/auth/drive.metadata');
+        $this->setScope(static::DRIVE_METADATA);
-        $this->setScope('https://www.googleapis.com/auth/drive.metadata.readonly');
+        $this->setScope(static::DRIVE_METADATA_READONLY);
-        $this->setScope('https://www.googleapis.com/auth/drive.readonly');
+        $this->setScope(static::DRIVE_READONLY);
         $service = $this->serviceDrive();
+        $response = null;
 
         try {
             $file = $service->files->get($fileId);
-            $response = null;
-
             $downloadUrl = $file->getDownloadUrl();
             if ($downloadUrl) {
                 $request = new Google_Http_Request($downloadUrl, 'GET', null, null);
                 $httpRequest = $service->getClient()->getAuth()->authenticatedRequest($request);
                 if ($httpRequest->getResponseHttpCode() == 200) {
-                    $response =  $httpRequest->getResponseBody();
+                    $response = $httpRequest->getResponseBody();
                 } else {
                     error_log(G::LoadTranslation("ID_MSG_AJAX_FAILURE"));
                 }
@@ -242,10 +242,11 @@ class PMDrive extends PMGoogleApi
      */
     public function setPermission($fileId, $value, $type = 'user', $role = 'reader', $sendNotification = false)
     {
-        $this->setScope('https://www.googleapis.com/auth/drive');
+        $this->setScope(static::DRIVE);
-        $this->setScope('https://www.googleapis.com/auth/drive.file');
+        $this->setScope(static::DRIVE_FILE);
 
         $service = $this->serviceDrive();
+        $permission = null;
 
         $newPermission = new Google_Service_Drive_Permission();
         $newPermission->setValue($value);

workflow/engine/classes/class.pmDynaform.php

@@ -374,24 +374,10 @@ class pmDynaform
                     }
                 }
                 if ($key === "type" && ($value === "file") && isset($this->fields["APP_DATA"]["APPLICATION"])) {
-                    /*----------------------------------********---------------------------------*/
-                    $licensedFeatures = &PMLicensedFeatures::getSingleton();
-                    $enablePMGmail = false;
-                    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                        G::LoadClass("pmDrive");
-                        $pmDrive = new PMDrive();
-                        $enablePMGmail = $pmDrive->getStatusService();
-                    }
-                    /*----------------------------------********---------------------------------*/
                     $oCriteria = new Criteria("workflow");
                     $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
                     $oCriteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
                     $oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
-                    /*----------------------------------********---------------------------------*/
-                    if ($enablePMGmail) {
-                        $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
-                    }
-                    /*----------------------------------********---------------------------------*/      
                     $oCriteria->addJoin(AppDocumentPeer::APP_DOC_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
                     $oCriteria->add(AppDocumentPeer::APP_UID, $this->fields["APP_DATA"]["APPLICATION"]);
                     $oCriteria->add(AppDocumentPeer::APP_DOC_FIELDNAME, $json->name);
@@ -403,14 +389,6 @@ class pmDynaform
                     while ($rs->next()) {
                         $row = $rs->getRow();
                         $linkDownload = "../cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
-                        /*----------------------------------********---------------------------------*/
-                        //change donwload link - drive
-                        $driveDownload = @unserialize($row['APP_DOC_DRIVE_DOWNLOAD']);
-                        if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED', $driveDownload) && $enablePMGmail
-                        ) {
-                            $linkDownload = $driveDownload['ATTACHED'];
-                        }
-                        /*----------------------------------********---------------------------------*/
                         array_push($links, $linkDownload);
                         array_push($labelsFromDb, $row["CON_VALUE"]);
                     }

workflow/engine/classes/class.pmGoogleApi.php

@@ -9,20 +9,28 @@ require_once PATH_TRUNK . 'vendor' . PATH_SEP . 'google' . PATH_SEP . 'apiclient
 
 class PMGoogleApi
 {
+    const DRIVE = 'https://www.googleapis.com/auth/drive';
+    const DRIVE_FILE = 'https://www.googleapis.com/auth/drive.file';
+    const DRIVE_APPS_READONLY = 'https://www.googleapis.com/auth/drive.apps.readonly';
+    const DRIVE_READONLY = 'https://www.googleapis.com/auth/drive.readonly';
+    const DRIVE_METADATA = 'https://www.googleapis.com/auth/drive.metadata';
+    const DRIVE_METADATA_READONLY = 'https://www.googleapis.com/auth/drive.metadata.readonly';
+    const DRIVE_APPDATA = 'https://www.googleapis.com/auth/drive.appdata';
+    const DRIVE_PHOTOS_READONLY = 'https://www.googleapis.com/auth/drive.photos.readonly';
+    const GMAIL_MODIFY = 'https://www.googleapis.com/auth/gmail.modify';
+
     private $scope = array();
     private $serviceAccountEmail;
-    private $serviceAccountP12;
+    private $serviceAccountCertificate;
-    private $statusService;
-    private $domain;
     private $user;
-
+    private $serviceGmailStatus = false;
-    private $typeAuthentication;
+    private $serviceDriveStatus = false;
-    private $accountJson;
+    private $configuration;
 
     public function __construct()
     {
         $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        if (!$licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+        if (!($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') || $licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M='))) {
             G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
             G::header('location: ../login/login');
             die;
@@ -50,35 +58,21 @@ class PMGoogleApi
         return $this->user;
     }
 
-    public function setStatusService($status)
-    {
-        $conf = $this->getConfigGmail();
-
-        $conf->aConfig['statusService'] = $status;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
-
-        $this->statusService = $status;
-    }
-
-    public function getStatusService()
-    {
-        return $this->statusService;
-    }
-
     public function getConfigGmail()
     {
-        $conf = new Configurations();
+        $this->configuration = new Configurations();
-        $conf->loadConfig($gmail, 'GOOGLE_API_SETTINGS', '');
+        $this->configuration->loadConfig($gmail, 'GOOGLE_API_SETTINGS', '');
-        return $conf;
+    }
+
+    public function setConfigGmail ($id, $value)
+    {
+        $this->configuration->aConfig[$id] = $value;
+        $this->configuration->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
     }
 
     public function setServiceAccountEmail($serviceAccountEmail)
     {
-        $conf = $this->getConfigGmail();
+        $this->setConfigGmail('serviceAccountEmail', $serviceAccountEmail);
-
-        $conf->aConfig['serviceAccountEmail'] = $serviceAccountEmail;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
-
         $this->serviceAccountEmail = $serviceAccountEmail;
     }
 
@@ -87,64 +81,45 @@ class PMGoogleApi
         return $this->serviceAccountEmail;
     }
 
-    public function setServiceAccountP12($serviceAccountP12)
+    public function setServiceAccountCertificate ($serviceAccountCertificate)
     {
-        $conf = $this->getConfigGmail();
+        $this->setConfigGmail('serviceAccountCertificate', $serviceAccountCertificate);
-
+        $this->serviceAccountCertificate = $serviceAccountCertificate;
-        $conf->aConfig['serviceAccountP12'] = $serviceAccountP12;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
-
-        $this->serviceAccountP12 = $serviceAccountP12;
     }
 
-    public function getServiceAccountP12()
+    public function getServiceAccountCertificate()
     {
-        return $this->serviceAccountP12;
+        return $this->serviceAccountCertificate;
     }
 
-    public function setDomain($domain)
+    public function setServiceGmailStatus($status)
     {
-        $conf = $this->getConfigGmail();
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-
+        if (!$licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-        $conf->aConfig['domain'] = $domain;
+            $status = false;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
+        }
-
+        $this->setConfigGmail('serviceGmailStatus', $status);
-        $this->domain = $domain;
+        $this->serviceGmailStatus = $status;
     }
 
-    public function getDomain()
+    public function getServiceGmailStatus()
     {
-        return $this->domain;
+        return $this->serviceGmailStatus;
     }
 
-    public function setTypeAuthentication($type)
+    public function setServiceDriveStatus($status)
     {
-        $conf = $this->getConfigGmail();
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-
+        if (!$licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
-        $conf->aConfig['typeAuthentication'] = $type;
+            $status = false;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
+        }
-
+        $this->setConfigGmail('serviceDriveStatus', $status);
-        $this->typeAuthentication = $type;
+        $this->serviceDriveStatus = $status;
     }
 
-    public function getTypeAuthentication()
+    public function getServiceDriveStatus()
     {
-        return $this->typeAuthentication;
+        return $this->serviceDriveStatus;
-    }
-
-    public function setAccountJson($accountJson)
-    {
-        $conf = $this->getConfigGmail();
-
-        $conf->aConfig['accountJson'] = $accountJson;
-        $conf->saveConfig('GOOGLE_API_SETTINGS', '', '', '');
-
-        $this->accountJson = $accountJson;
-    }
-
-    public function getAccountJson()
-    {
-        return $this->accountJson;
     }
 
     /**
@@ -153,23 +128,19 @@ class PMGoogleApi
      */
     public function loadSettings()
     {
-        $conf = $this->getConfigGmail();
+        $this->getConfigGmail();
 
-        $typeAuthentication     = empty($conf->aConfig['typeAuthentication']) ? ''  : $conf->aConfig['typeAuthentication'];
+        $serviceAccountCertificate = empty($this->configuration->aConfig['serviceAccountCertificate']) ? '' : $this->configuration->aConfig['serviceAccountCertificate'];
-        $accountJson            = empty($conf->aConfig['accountJson']) ? ''   : $conf->aConfig['accountJson'];
+        $serviceAccountEmail = empty($this->configuration->aConfig['serviceAccountEmail']) ? '' : $this->configuration->aConfig['serviceAccountEmail'];
-
+        $serviceGmailStatus = empty($this->configuration->aConfig['serviceGmailStatus']) ? false : $this->configuration->aConfig['serviceGmailStatus'];
-        $serviceAccountP12      = empty($conf->aConfig['serviceAccountP12']) ? ''   : $conf->aConfig['serviceAccountP12'];
+        $serviceDriveStatus = empty($this->configuration->aConfig['serviceDriveStatus']) ? false : $this->configuration->aConfig['serviceDriveStatus'];
-        $serviceAccountEmail    = empty($conf->aConfig['serviceAccountEmail']) ? '' : $conf->aConfig['serviceAccountEmail'];
-        $statusService          = empty($conf->aConfig['statusService']) ? ''       : $conf->aConfig['statusService'];
 
         $this->scope = array();
 
-        $this->setTypeAuthentication($typeAuthentication);
+        $this->serviceAccountEmail = $serviceAccountEmail;
-        $this->setAccountJson($accountJson);
+        $this->serviceAccountCertificate = $serviceAccountCertificate;
-
+        $this->serviceGmailStatus = $serviceGmailStatus;
-        $this->setServiceAccountEmail($serviceAccountEmail);
+        $this->serviceDriveStatus = $serviceDriveStatus;
-        $this->setServiceAccountP12($serviceAccountP12);
-        $this->setStatusService($statusService);
     }
 
     /**
@@ -180,127 +151,65 @@ class PMGoogleApi
     public function serviceClient()
     {
         $client = null;
-        if ($this->typeAuthentication == 'webApplication') {
+        if (file_exists(PATH_DATA_SITE . $this->serviceAccountCertificate)) {
-            if (file_exists(PATH_DATA_SITE . $this->accountJson)) {
+            $key = file_get_contents(PATH_DATA_SITE . $this->serviceAccountCertificate);
-                $credential = file_get_contents(PATH_DATA_SITE . $this->accountJson);
-            } else {
-                throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_JSON_ERROR'));
-            }
-
-
-            $client = new Google_Client();
-            $client->setAuthConfig($credential);
-            $client->addScope($this->scope);
-
-            if (!empty($_SESSION['google_token'])) {
-                $client->setAccessToken($_SESSION['google_token']);
-                if ($client->isAccessTokenExpired()) {
-                    $client->getRefreshToken();
-                    unset($_SESSION['google_token']);
-                    $_SESSION['google_token'] = $client->getAccessToken();
-                }
-            } else if (!empty($_SESSION['CODE_GMAIL'])) {
-                $token = $client->authenticate($_SESSION['CODE_GMAIL']);
-                $_SESSION['google_token'] = $client->getAccessToken();
-            } else {
-                $authUrl = $client->createAuthUrl();
-                echo '<script type="text/javascript">
-                    var opciones = "width=450,height=480,scrollbars=NO, locatin=NO,toolbar=NO, status=NO, menumbar=NO, top=10%, left=25%";
-                    window.open("' . $authUrl . '","Gmail", opciones);
-                    </script>';
-                die;
-            }
-        } else if ($this->typeAuthentication == 'serviceAccount') {
-
-            if (file_exists(PATH_DATA_SITE . $this->serviceAccountP12)) {
-                $key = file_get_contents(PATH_DATA_SITE . $this->serviceAccountP12);
-            } else {
-                throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR'));
-            }
-
-            $assertionCredentials = new Google_Auth_AssertionCredentials(
-                $this->serviceAccountEmail,
-                $this->scope,
-                $key
-            );
-            $assertionCredentials->sub = $this->user;
-
-            $client = new Google_Client();
-            $client->setApplicationName("PMDrive");
-            $client->setAssertionCredentials($assertionCredentials);
         } else {
-            throw new Exception(G::LoadTranslation('ID_SERVER_COMMUNICATION_ERROR'));
+            throw new Exception(G::LoadTranslation('ID_GOOGLE_CERTIFICATE_ERROR'));
         }
 
+        $data = json_decode($key);
+        $assertionCredentials = new Google_Auth_AssertionCredentials(
+            $this->serviceAccountEmail,
+            $this->scope,
+            $data->private_key
+        );
+
+        $assertionCredentials->sub = $this->user;
+
+        $client = new Google_Client();
+        $client->setApplicationName("PMDrive");
+        $client->setAssertionCredentials($assertionCredentials);
+
+
         return $client;
     }
 
     /**
      * New service client - Authentication google Api
      *
-     * @return Google_Service_Client $service API service instance.
+     * @param $credentials
+     * @throws \Exception
+     * @return \StdClass response.
      */
     public function testService($credentials)
     {
 
         $scope = array(
-            'https://www.googleapis.com/auth/drive',
+            static::DRIVE,
-            'https://www.googleapis.com/auth/drive.file',
+            static::DRIVE_FILE,
-            'https://www.googleapis.com/auth/drive.readonly',
+            static::DRIVE_READONLY,
-            'https://www.googleapis.com/auth/drive.metadata.readonly',
+            static::DRIVE_METADATA,
-            'https://www.googleapis.com/auth/drive.appdata',
+            static::DRIVE_METADATA_READONLY,
-            'https://www.googleapis.com/auth/drive.metadata',
+            static::DRIVE_APPDATA,
-            'https://www.googleapis.com/auth/drive.photos.readonly'
+            static::DRIVE_PHOTOS_READONLY
         );
 
-        if ($credentials->typeAuth == 'webApplication') {
+        if (file_exists($credentials->pathServiceAccountCertificate)) {
-
+            $key = file_get_contents($credentials->pathServiceAccountCertificate);
-            if (file_exists($credentials->pathFileJson)) {
-                $credential = file_get_contents($credentials->pathFileJson);
-            } else {
-                throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_JSON_ERROR'));
-            }
-
-            $client = new Google_Client();
-            $client->setAuthConfig($credential);
-            $client->addScope($scope);
-
-            if (!empty($_SESSION['google_token'])) {
-                $client->setAccessToken($_SESSION['google_token']);
-                if ($client->isAccessTokenExpired()) {
-                    unset($_SESSION['google_token']);
-                }
-            } else if (!empty($_SESSION['CODE_GMAIL'])) {
-                $token = $client->authenticate($_SESSION['CODE_GMAIL']);
-                $_SESSION['google_token'] = $client->getAccessToken();
-            } else {
-                $authUrl = $client->createAuthUrl();
-                echo '<script type="text/javascript">
-                    var opciones = "width=450,height=480,scrollbars=NO, locatin=NO,toolbar=NO, status=NO, menumbar=NO, top=10%, left=25%";
-                    window.open("' . $authUrl . '","Gmail", opciones);
-                    </script>';
-                die;
-            }
         } else {
-
+            throw new Exception(G::LoadTranslation('ID_GOOGLE_CERTIFICATE_ERROR'));
-            if (file_exists($credentials->pathServiceAccountP12)) {
-                $key = file_get_contents($credentials->pathServiceAccountP12);
-            } else {
-                throw new Exception(G::LoadTranslation('ID_GOOGLE_FILE_P12_ERROR'));
-            }
-            $assertionCredentials = new Google_Auth_AssertionCredentials(
-                $credentials->emailServiceAccount,
-                $scope,
-                $key
-            );
-            $assertionCredentials->sub = $this->user;
-
-            $client = new Google_Client();
-            $client->setApplicationName("PMDrive");
-            $client->setAssertionCredentials($assertionCredentials);
         }
+        $data = json_decode($key);
+        $assertionCredentials = new Google_Auth_AssertionCredentials(
+            $credentials->emailServiceAccount,
+            $scope,
+            $data->private_key
+        );
+        $assertionCredentials->sub = $this->user;
 
-
+        $client = new Google_Client();
+        $client->setApplicationName("PMDrive");
+        $client->setAssertionCredentials($assertionCredentials);
 
         $service = new Google_Service_Drive($client);
 

workflow/engine/classes/class.wsBase.php

@@ -1017,14 +1017,17 @@ class wsBase
             );
 
             $oSpool->create( $messageArray );
-            $oSpool->sendMail();
+            if ($gmail != 1){
+	            $oSpool->sendMail();
 
-            if ($oSpool->status == 'sent') {
+	            if ($oSpool->status == 'sent') {
-                $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
+	                $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
+	            } else {
+	                $result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) );
+	            }
             } else {
-                $result = new wsResponse( 29, $oSpool->status . ' ' . $oSpool->error . print_r( $aSetup, 1 ) );
+            	$result = "";
             }
-
             return $result;
         } catch (Exception $e) {
             return new wsResponse( 100, $e->getMessage() );

workflow/engine/classes/model/AppDocument.php

@@ -66,6 +66,8 @@ class AppDocument extends BaseAppDocument
 
     /*----------------------------------********---------------------------------*/
     protected $driveDownload = array();
+    protected $syncWithDrive = '';
+    protected $syncPermissions = '';
     /*----------------------------------********---------------------------------*/
 
     /*
@@ -220,6 +222,7 @@ class AppDocument extends BaseAppDocument
 
             /*----------------------------------********---------------------------------*/
             $aData['APP_DOC_DRIVE_DOWNLOAD'] = serialize($this->driveDownload);
+            //$aData['SYNC_PERMISSIONS'] = $this->syncPermissions;
             /*----------------------------------********---------------------------------*/
             $oAppDocument->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
             $oAppDocument->setDocVersion( $docVersion );
@@ -267,6 +270,7 @@ class AppDocument extends BaseAppDocument
         $oConnection = Propel::getConnection( AppDocumentPeer::DATABASE_NAME );
         try {
             $oAppDocument = AppDocumentPeer::retrieveByPK( $aData['APP_DOC_UID'], $aData['DOC_VERSION'] );
+
             if (! is_null( $oAppDocument )) {
                 /*----------------------------------********---------------------------------*/
                 $driveDownload = @unserialize($oAppDocument->getAppDocDriveDownload());
@@ -275,6 +279,10 @@ class AppDocument extends BaseAppDocument
                 } else {
                     $aData['APP_DOC_DRIVE_DOWNLOAD'] = serialize($this->driveDownload);
                 }
+                //$aData['SYNC_PERMISSIONS'] = $this->syncPermissions;
+                //$aData['SYNC_WITH_DRIVE'] = $this->syncWithDrive;
+                //$oAppDocument->setSyncWithDrive($aData['SYNC_WITH_DRIVE']);
+                //$oAppDocument->sync_with_drive = $aData['SYNC_WITH_DRIVE'];
                 /*----------------------------------********---------------------------------*/
                 $oAppDocument->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
                 if ($oAppDocument->validate()) {
@@ -508,6 +516,29 @@ class AppDocument extends BaseAppDocument
         }
         return $url;
     }
+    /*public function setSyncWithDrive ($key)
+    {
+        $data = array('SYNCHRONIZED', 'UNSYNCHRONIZED', 'NO_EXIST_FILE_PM');
+        if (array_search($key, $data) === false) {
+            $key = 'UNSYNCHRONIZED';
+        }
+        $this->syncWithDrive = $key;
+    }*/
+
+    /*public function getSyncWithDrive ()
+    {
+        return $this->syncWithDrive;
+    }*/
+
+    /*public function setSyncPermissions ($email)
+    {
+        $this->syncPermissions = empty($this->syncPermissions) ? $email : ','.$email;
+    }
+
+    public function getSyncPermissions ()
+    {
+        return !empty($this->syncPermissions) ? explode(',', $this->syncPermissions) : '';
+    }*/
 
     /*----------------------------------********---------------------------------*/
 

workflow/engine/classes/model/AppFolder.php

@@ -293,16 +293,6 @@ class AppFolder extends BaseAppFolder
         //require_once ("classes/model/OutputDocument.php");
         //require_once ("classes/model/Users.php");
 
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
-        $enablePMGmail = false;
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-        }
-        /*----------------------------------********---------------------------------*/
-
         G::LoadClass( 'case' );
         $oCase = new Cases();
         G::LoadClass( 'process' );
@@ -328,11 +318,7 @@ class AppFolder extends BaseAppFolder
         $oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_STATUS);
         $oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_STATUS_DATE);
         $oCriteria->addSelectColumn( AppDocumentPeer::APP_DOC_FIELDNAME);
-        /*----------------------------------********---------------------------------*/
+        $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
-        if ($enablePMGmail) {
-            $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
-        }
-        /*----------------------------------********---------------------------------*/
 
         if ((is_array( $docIdFilter )) && (count( $docIdFilter ) > 0)) {
             //Search by App Doc UID no matter what Folder it is
@@ -433,39 +419,6 @@ class AppFolder extends BaseAppFolder
                 //$filesResult [] = $completeInfo;
 
                 if ($completeInfo['APP_DOC_STATUS'] != "DELETED") {
-                    /*----------------------------------********---------------------------------*/
-                    if ($enablePMGmail) {
-                        $driveDownload = @unserialize($completeInfo['APP_DOC_DRIVE_DOWNLOAD']);
-                        switch ($completeInfo['APP_DOC_TYPE']) {
-                            case 'INPUT':
-                                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                                        $driveDownload)
-                                ) {
-                                    $completeInfo['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-                                }
-                                break;
-                            case 'ATTACHED':
-                                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED',
-                                        $driveDownload)
-                                ) {
-                                    $completeInfo['DOWNLOAD_LINK'] = $driveDownload['ATTACHED'];
-                                }
-                                break;
-                            case 'OUTPUT':
-                                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_DOC',
-                                        $driveDownload)
-                                ) {
-                                    $completeInfo['DOWNLOAD_LINK1'] = $driveDownload['OUTPUT_DOC'];
-                                }
-                                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_PDF',
-                                        $driveDownload)
-                                ) {
-                                    $completeInfo['DOWNLOAD_LINK'] = $driveDownload['OUTPUT_PDF'];
-                                }
-                                break;
-                        }
-                    }
-                    /*----------------------------------********---------------------------------*/
                     if (in_array($row["APP_DOC_UID"], $completeInfo["INPUT_DOCUMENTS"]) || in_array($row["APP_DOC_UID"], $completeInfo["OUTPUT_DOCUMENTS"]) || in_array($completeInfo["USR_UID"], array($_SESSION["USER_LOGGED"], "-1")) || $user == "") {
                         if (count( $docIdFilter ) > 0) {
                             if (in_array( $row['APP_DOC_UID'], $docIdFilter )) {

workflow/engine/classes/model/GmailRelabeling.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once 'classes/model/om/BaseGmailRelabeling.php';
+
+
+/**
+ * Skeleton subclass for representing a row from the 'GMAIL_RELABELING' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class GmailRelabeling extends BaseGmailRelabeling {
+
+} // GmailRelabeling

workflow/engine/classes/model/GmailRelabelingPeer.php

@@ -0,0 +1,23 @@
+<?php
+
+  // include base peer class
+  require_once 'classes/model/om/BaseGmailRelabelingPeer.php';
+
+  // include object class
+  include_once 'classes/model/GmailRelabeling.php';
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'GMAIL_RELABELING' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class GmailRelabelingPeer extends BaseGmailRelabelingPeer {
+
+} // GmailRelabelingPeer

workflow/engine/classes/model/map/AppDocumentMapBuilder.php

@@ -97,6 +97,10 @@ class AppDocumentMapBuilder
 
         $tMap->addColumn('APP_DOC_DRIVE_DOWNLOAD', 'AppDocDriveDownload', 'string', CreoleTypes::LONGVARCHAR, false, null);
 
+        $tMap->addColumn('SYNC_WITH_DRIVE', 'SyncWithDrive', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('SYNC_PERMISSIONS', 'SyncPermissions', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
         $tMap->addValidator('APP_DOC_UID', 'maxLength', 'propel.validator.MaxLengthValidator', '32', 'Application Document UID can be no larger than 32 in size');
 
         $tMap->addValidator('APP_DOC_UID', 'required', 'propel.validator.RequiredValidator', '', 'Application Document UID is required.');
@@ -127,6 +131,10 @@ class AppDocumentMapBuilder
 
         $tMap->addValidator('APP_DOC_STATUS', 'required', 'propel.validator.RequiredValidator', '', 'Application Document Status is required.');
 
+        $tMap->addValidator('SYNC_WITH_DRIVE', 'validValues', 'propel.validator.ValidValuesValidator', 'SYNCHRONIZED|UNSYNCHRONIZED|NO_EXIST_FILE_PM', 'Please select a valid type.');
+
+        $tMap->addValidator('SYNC_WITH_DRIVE', 'required', 'propel.validator.RequiredValidator', '', 'Type is required.');
+
     } // doBuild()
 
 } // AppDocumentMapBuilder

workflow/engine/classes/model/map/GmailRelabelingMapBuilder.php

@@ -0,0 +1,86 @@
+<?php
+
+require_once 'propel/map/MapBuilder.php';
+include_once 'creole/CreoleTypes.php';
+
+
+/**
+ * This class adds structure of 'GMAIL_RELABELING' table to 'workflow' DatabaseMap object.
+ *
+ *
+ *
+ * These statically-built map classes are used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    workflow.classes.model.map
+ */
+class GmailRelabelingMapBuilder
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'classes.model.map.GmailRelabelingMapBuilder';
+
+    /**
+     * The database map.
+     */
+    private $dbMap;
+
+    /**
+     * Tells us if this DatabaseMapBuilder is built so that we
+     * don't have to re-build it every time.
+     *
+     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
+     */
+    public function isBuilt()
+    {
+        return ($this->dbMap !== null);
+    }
+
+    /**
+     * Gets the databasemap this map builder built.
+     *
+     * @return     the databasemap
+     */
+    public function getDatabaseMap()
+    {
+        return $this->dbMap;
+    }
+
+    /**
+     * The doBuild() method builds the DatabaseMap
+     *
+     * @return     void
+     * @throws     PropelException
+     */
+    public function doBuild()
+    {
+        $this->dbMap = Propel::getDatabaseMap('workflow');
+
+        $tMap = $this->dbMap->addTable('GMAIL_RELABELING');
+        $tMap->setPhpName('GmailRelabeling');
+
+        $tMap->setUseIdGenerator(false);
+
+        $tMap->addPrimaryKey('LABELING_UID', 'LabelingUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('CREATE_DATE', 'CreateDate', 'int', CreoleTypes::TIMESTAMP, true, null);
+
+        $tMap->addColumn('APP_UID', 'AppUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('DEL_INDEX', 'DelIndex', 'int', CreoleTypes::INTEGER, true, null);
+
+        $tMap->addColumn('CURRENT_LAST_INDEX', 'CurrentLastIndex', 'int', CreoleTypes::INTEGER, true, null);
+
+        $tMap->addColumn('UNASSIGNED', 'Unassigned', 'int', CreoleTypes::INTEGER, true, null);
+
+        $tMap->addColumn('STATUS', 'Status', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('MSG_ERROR', 'MsgError', 'string', CreoleTypes::LONGVARCHAR, false, null);
+
+    } // doBuild()
+
+} // GmailRelabelingMapBuilder

workflow/engine/classes/model/om/BaseAppDocument.php

@@ -123,6 +123,18 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
      */
     protected $app_doc_drive_download;
 
+    /**
+     * The value for the sync_with_drive field.
+     * @var        string
+     */
+    protected $sync_with_drive = 'UNSYNCHRONIZED';
+
+    /**
+     * The value for the sync_permissions field.
+     * @var        string
+     */
+    protected $sync_permissions;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -355,6 +367,28 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
         return $this->app_doc_drive_download;
     }
 
+    /**
+     * Get the [sync_with_drive] column value.
+     * 
+     * @return     string
+     */
+    public function getSyncWithDrive()
+    {
+
+        return $this->sync_with_drive;
+    }
+
+    /**
+     * Get the [sync_permissions] column value.
+     * 
+     * @return     string
+     */
+    public function getSyncPermissions()
+    {
+
+        return $this->sync_permissions;
+    }
+
     /**
      * Set the value of [app_doc_uid] column.
      * 
@@ -721,6 +755,50 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
     } // setAppDocDriveDownload()
 
+    /**
+     * Set the value of [sync_with_drive] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setSyncWithDrive($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->sync_with_drive !== $v || $v === 'UNSYNCHRONIZED') {
+            $this->sync_with_drive = $v;
+            $this->modifiedColumns[] = AppDocumentPeer::SYNC_WITH_DRIVE;
+        }
+
+    } // setSyncWithDrive()
+
+    /**
+     * Set the value of [sync_permissions] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setSyncPermissions($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->sync_permissions !== $v) {
+            $this->sync_permissions = $v;
+            $this->modifiedColumns[] = AppDocumentPeer::SYNC_PERMISSIONS;
+        }
+
+    } // setSyncPermissions()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -770,12 +848,16 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
             $this->app_doc_drive_download = $rs->getString($startcol + 15);
 
+            $this->sync_with_drive = $rs->getString($startcol + 16);
+
+            $this->sync_permissions = $rs->getString($startcol + 17);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 16; // 16 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 18; // 18 = AppDocumentPeer::NUM_COLUMNS - AppDocumentPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating AppDocument object", $e);
@@ -1027,6 +1109,12 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             case 15:
                 return $this->getAppDocDriveDownload();
                 break;
+            case 16:
+                return $this->getSyncWithDrive();
+                break;
+            case 17:
+                return $this->getSyncPermissions();
+                break;
             default:
                 return null;
                 break;
@@ -1063,6 +1151,8 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             $keys[13] => $this->getAppDocStatusDate(),
             $keys[14] => $this->getAppDocFieldname(),
             $keys[15] => $this->getAppDocDriveDownload(),
+            $keys[16] => $this->getSyncWithDrive(),
+            $keys[17] => $this->getSyncPermissions(),
         );
         return $result;
     }
@@ -1142,6 +1232,12 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             case 15:
                 $this->setAppDocDriveDownload($value);
                 break;
+            case 16:
+                $this->setSyncWithDrive($value);
+                break;
+            case 17:
+                $this->setSyncPermissions($value);
+                break;
         } // switch()
     }
 
@@ -1229,6 +1325,14 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             $this->setAppDocDriveDownload($arr[$keys[15]]);
         }
 
+        if (array_key_exists($keys[16], $arr)) {
+            $this->setSyncWithDrive($arr[$keys[16]]);
+        }
+
+        if (array_key_exists($keys[17], $arr)) {
+            $this->setSyncPermissions($arr[$keys[17]]);
+        }
+
     }
 
     /**
@@ -1304,6 +1408,14 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
             $criteria->add(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, $this->app_doc_drive_download);
         }
 
+        if ($this->isColumnModified(AppDocumentPeer::SYNC_WITH_DRIVE)) {
+            $criteria->add(AppDocumentPeer::SYNC_WITH_DRIVE, $this->sync_with_drive);
+        }
+
+        if ($this->isColumnModified(AppDocumentPeer::SYNC_PERMISSIONS)) {
+            $criteria->add(AppDocumentPeer::SYNC_PERMISSIONS, $this->sync_permissions);
+        }
+
 
         return $criteria;
     }
@@ -1398,6 +1510,10 @@ abstract class BaseAppDocument extends BaseObject implements Persistent
 
         $copyObj->setAppDocDriveDownload($this->app_doc_drive_download);
 
+        $copyObj->setSyncWithDrive($this->sync_with_drive);
+
+        $copyObj->setSyncPermissions($this->sync_permissions);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseAppDocumentPeer.php

@@ -25,7 +25,7 @@ abstract class BaseAppDocumentPeer
     const CLASS_DEFAULT = 'classes.model.AppDocument';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 16;
+    const NUM_COLUMNS = 18;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -79,6 +79,12 @@ abstract class BaseAppDocumentPeer
     /** the column name for the APP_DOC_DRIVE_DOWNLOAD field */
     const APP_DOC_DRIVE_DOWNLOAD = 'APP_DOCUMENT.APP_DOC_DRIVE_DOWNLOAD';
 
+    /** the column name for the SYNC_WITH_DRIVE field */
+    const SYNC_WITH_DRIVE = 'APP_DOCUMENT.SYNC_WITH_DRIVE';
+
+    /** the column name for the SYNC_PERMISSIONS field */
+    const SYNC_PERMISSIONS = 'APP_DOCUMENT.SYNC_PERMISSIONS';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -90,10 +96,10 @@ abstract class BaseAppDocumentPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', ),
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid', 'DocVersion', 'AppUid', 'DelIndex', 'DocUid', 'UsrUid', 'AppDocType', 'AppDocCreateDate', 'AppDocIndex', 'FolderUid', 'AppDocPlugin', 'AppDocTags', 'AppDocStatus', 'AppDocStatusDate', 'AppDocFieldname', 'AppDocDriveDownload', 'SyncWithDrive', 'SyncPermissions', ),
-        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID, AppDocumentPeer::DOC_VERSION, AppDocumentPeer::APP_UID, AppDocumentPeer::DEL_INDEX, AppDocumentPeer::DOC_UID, AppDocumentPeer::USR_UID, AppDocumentPeer::APP_DOC_TYPE, AppDocumentPeer::APP_DOC_CREATE_DATE, AppDocumentPeer::APP_DOC_INDEX, AppDocumentPeer::FOLDER_UID, AppDocumentPeer::APP_DOC_PLUGIN, AppDocumentPeer::APP_DOC_TAGS, AppDocumentPeer::APP_DOC_STATUS, AppDocumentPeer::APP_DOC_STATUS_DATE, AppDocumentPeer::APP_DOC_FIELDNAME, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD, AppDocumentPeer::SYNC_WITH_DRIVE, AppDocumentPeer::SYNC_PERMISSIONS, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID', 'DOC_VERSION', 'APP_UID', 'DEL_INDEX', 'DOC_UID', 'USR_UID', 'APP_DOC_TYPE', 'APP_DOC_CREATE_DATE', 'APP_DOC_INDEX', 'FOLDER_UID', 'APP_DOC_PLUGIN', 'APP_DOC_TAGS', 'APP_DOC_STATUS', 'APP_DOC_STATUS_DATE', 'APP_DOC_FIELDNAME', 'APP_DOC_DRIVE_DOWNLOAD', 'SYNC_WITH_DRIVE', 'SYNC_PERMISSIONS', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -103,10 +109,10 @@ abstract class BaseAppDocumentPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'DocVersion' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'DocUid' => 4, 'UsrUid' => 5, 'AppDocType' => 6, 'AppDocCreateDate' => 7, 'AppDocIndex' => 8, 'FolderUid' => 9, 'AppDocPlugin' => 10, 'AppDocTags' => 11, 'AppDocStatus' => 12, 'AppDocStatusDate' => 13, 'AppDocFieldname' => 14, 'AppDocDriveDownload' => 15, ),
+        BasePeer::TYPE_PHPNAME => array ('AppDocUid' => 0, 'DocVersion' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'DocUid' => 4, 'UsrUid' => 5, 'AppDocType' => 6, 'AppDocCreateDate' => 7, 'AppDocIndex' => 8, 'FolderUid' => 9, 'AppDocPlugin' => 10, 'AppDocTags' => 11, 'AppDocStatus' => 12, 'AppDocStatusDate' => 13, 'AppDocFieldname' => 14, 'AppDocDriveDownload' => 15, 'SyncWithDrive' => 16, 'SyncPermissions' => 17, ),
-        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::DOC_VERSION => 1, AppDocumentPeer::APP_UID => 2, AppDocumentPeer::DEL_INDEX => 3, AppDocumentPeer::DOC_UID => 4, AppDocumentPeer::USR_UID => 5, AppDocumentPeer::APP_DOC_TYPE => 6, AppDocumentPeer::APP_DOC_CREATE_DATE => 7, AppDocumentPeer::APP_DOC_INDEX => 8, AppDocumentPeer::FOLDER_UID => 9, AppDocumentPeer::APP_DOC_PLUGIN => 10, AppDocumentPeer::APP_DOC_TAGS => 11, AppDocumentPeer::APP_DOC_STATUS => 12, AppDocumentPeer::APP_DOC_STATUS_DATE => 13, AppDocumentPeer::APP_DOC_FIELDNAME => 14, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 15, ),
+        BasePeer::TYPE_COLNAME => array (AppDocumentPeer::APP_DOC_UID => 0, AppDocumentPeer::DOC_VERSION => 1, AppDocumentPeer::APP_UID => 2, AppDocumentPeer::DEL_INDEX => 3, AppDocumentPeer::DOC_UID => 4, AppDocumentPeer::USR_UID => 5, AppDocumentPeer::APP_DOC_TYPE => 6, AppDocumentPeer::APP_DOC_CREATE_DATE => 7, AppDocumentPeer::APP_DOC_INDEX => 8, AppDocumentPeer::FOLDER_UID => 9, AppDocumentPeer::APP_DOC_PLUGIN => 10, AppDocumentPeer::APP_DOC_TAGS => 11, AppDocumentPeer::APP_DOC_STATUS => 12, AppDocumentPeer::APP_DOC_STATUS_DATE => 13, AppDocumentPeer::APP_DOC_FIELDNAME => 14, AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD => 15, AppDocumentPeer::SYNC_WITH_DRIVE => 16, AppDocumentPeer::SYNC_PERMISSIONS => 17, ),
-        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'DOC_VERSION' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'DOC_UID' => 4, 'USR_UID' => 5, 'APP_DOC_TYPE' => 6, 'APP_DOC_CREATE_DATE' => 7, 'APP_DOC_INDEX' => 8, 'FOLDER_UID' => 9, 'APP_DOC_PLUGIN' => 10, 'APP_DOC_TAGS' => 11, 'APP_DOC_STATUS' => 12, 'APP_DOC_STATUS_DATE' => 13, 'APP_DOC_FIELDNAME' => 14, 'APP_DOC_DRIVE_DOWNLOAD' => 15, ),
+        BasePeer::TYPE_FIELDNAME => array ('APP_DOC_UID' => 0, 'DOC_VERSION' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'DOC_UID' => 4, 'USR_UID' => 5, 'APP_DOC_TYPE' => 6, 'APP_DOC_CREATE_DATE' => 7, 'APP_DOC_INDEX' => 8, 'FOLDER_UID' => 9, 'APP_DOC_PLUGIN' => 10, 'APP_DOC_TAGS' => 11, 'APP_DOC_STATUS' => 12, 'APP_DOC_STATUS_DATE' => 13, 'APP_DOC_FIELDNAME' => 14, 'APP_DOC_DRIVE_DOWNLOAD' => 15, 'SYNC_WITH_DRIVE' => 16, 'SYNC_PERMISSIONS' => 17, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, )
     );
 
     /**
@@ -239,6 +245,10 @@ abstract class BaseAppDocumentPeer
 
         $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
 
+        $criteria->addSelectColumn(AppDocumentPeer::SYNC_WITH_DRIVE);
+
+        $criteria->addSelectColumn(AppDocumentPeer::SYNC_PERMISSIONS);
+
     }
 
     const COUNT = 'COUNT(APP_DOCUMENT.APP_DOC_UID)';
@@ -611,6 +621,9 @@ abstract class BaseAppDocumentPeer
         if ($obj->isNew() || $obj->isColumnModified(AppDocumentPeer::APP_DOC_STATUS))
             $columns[AppDocumentPeer::APP_DOC_STATUS] = $obj->getAppDocStatus();
 
+        if ($obj->isNew() || $obj->isColumnModified(AppDocumentPeer::SYNC_WITH_DRIVE))
+            $columns[AppDocumentPeer::SYNC_WITH_DRIVE] = $obj->getSyncWithDrive();
+
         }
 
         return BasePeer::doValidate(AppDocumentPeer::DATABASE_NAME, AppDocumentPeer::TABLE_NAME, $columns);

workflow/engine/classes/model/om/BaseGmailRelabeling.php

@@ -0,0 +1,944 @@
+<?php
+
+require_once 'propel/om/BaseObject.php';
+
+require_once 'propel/om/Persistent.php';
+
+
+include_once 'propel/util/Criteria.php';
+
+include_once 'classes/model/GmailRelabelingPeer.php';
+
+/**
+ * Base class that represents a row from the 'GMAIL_RELABELING' table.
+ *
+ * 
+ *
+ * @package    workflow.classes.model.om
+ */
+abstract class BaseGmailRelabeling extends BaseObject implements Persistent
+{
+
+    /**
+     * The Peer class.
+     * Instance provides a convenient way of calling static methods on a class
+     * that calling code may not be able to identify.
+     * @var        GmailRelabelingPeer
+    */
+    protected static $peer;
+
+    /**
+     * The value for the labeling_uid field.
+     * @var        string
+     */
+    protected $labeling_uid;
+
+    /**
+     * The value for the create_date field.
+     * @var        int
+     */
+    protected $create_date;
+
+    /**
+     * The value for the app_uid field.
+     * @var        string
+     */
+    protected $app_uid = '';
+
+    /**
+     * The value for the del_index field.
+     * @var        int
+     */
+    protected $del_index = 0;
+
+    /**
+     * The value for the current_last_index field.
+     * @var        int
+     */
+    protected $current_last_index = 0;
+
+    /**
+     * The value for the unassigned field.
+     * @var        int
+     */
+    protected $unassigned = 0;
+
+    /**
+     * The value for the status field.
+     * @var        string
+     */
+    protected $status = 'pending';
+
+    /**
+     * The value for the msg_error field.
+     * @var        string
+     */
+    protected $msg_error;
+
+    /**
+     * Flag to prevent endless save loop, if this object is referenced
+     * by another object which falls in this transaction.
+     * @var        boolean
+     */
+    protected $alreadyInSave = false;
+
+    /**
+     * Flag to prevent endless validation loop, if this object is referenced
+     * by another object which falls in this transaction.
+     * @var        boolean
+     */
+    protected $alreadyInValidation = false;
+
+    /**
+     * Get the [labeling_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getLabelingUid()
+    {
+
+        return $this->labeling_uid;
+    }
+
+    /**
+     * Get the [optionally formatted] [create_date] column value.
+     * 
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                          If format is NULL, then the integer unix timestamp will be returned.
+     * @return     mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
+     * @throws     PropelException - if unable to convert the date/time to timestamp.
+     */
+    public function getCreateDate($format = 'Y-m-d H:i:s')
+    {
+
+        if ($this->create_date === null || $this->create_date === '') {
+            return null;
+        } elseif (!is_int($this->create_date)) {
+            // a non-timestamp value was set externally, so we convert it
+            $ts = strtotime($this->create_date);
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [create_date] as date/time value: " .
+                    var_export($this->create_date, true));
+            }
+        } else {
+            $ts = $this->create_date;
+        }
+        if ($format === null) {
+            return $ts;
+        } elseif (strpos($format, '%') !== false) {
+            return strftime($format, $ts);
+        } else {
+            return date($format, $ts);
+        }
+    }
+
+    /**
+     * Get the [app_uid] column value.
+     * 
+     * @return     string
+     */
+    public function getAppUid()
+    {
+
+        return $this->app_uid;
+    }
+
+    /**
+     * Get the [del_index] column value.
+     * 
+     * @return     int
+     */
+    public function getDelIndex()
+    {
+
+        return $this->del_index;
+    }
+
+    /**
+     * Get the [current_last_index] column value.
+     * 
+     * @return     int
+     */
+    public function getCurrentLastIndex()
+    {
+
+        return $this->current_last_index;
+    }
+
+    /**
+     * Get the [unassigned] column value.
+     * 
+     * @return     int
+     */
+    public function getUnassigned()
+    {
+
+        return $this->unassigned;
+    }
+
+    /**
+     * Get the [status] column value.
+     * 
+     * @return     string
+     */
+    public function getStatus()
+    {
+
+        return $this->status;
+    }
+
+    /**
+     * Get the [msg_error] column value.
+     * 
+     * @return     string
+     */
+    public function getMsgError()
+    {
+
+        return $this->msg_error;
+    }
+
+    /**
+     * Set the value of [labeling_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setLabelingUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->labeling_uid !== $v) {
+            $this->labeling_uid = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::LABELING_UID;
+        }
+
+    } // setLabelingUid()
+
+    /**
+     * Set the value of [create_date] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setCreateDate($v)
+    {
+
+        if ($v !== null && !is_int($v)) {
+            $ts = strtotime($v);
+            //Date/time accepts null values
+            if ($v == '') {
+                $ts = null;
+            }
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [create_date] from input: " .
+                    var_export($v, true));
+            }
+        } else {
+            $ts = $v;
+        }
+        if ($this->create_date !== $ts) {
+            $this->create_date = $ts;
+            $this->modifiedColumns[] = GmailRelabelingPeer::CREATE_DATE;
+        }
+
+    } // setCreateDate()
+
+    /**
+     * Set the value of [app_uid] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setAppUid($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->app_uid !== $v || $v === '') {
+            $this->app_uid = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::APP_UID;
+        }
+
+    } // setAppUid()
+
+    /**
+     * Set the value of [del_index] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setDelIndex($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->del_index !== $v || $v === 0) {
+            $this->del_index = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::DEL_INDEX;
+        }
+
+    } // setDelIndex()
+
+    /**
+     * Set the value of [current_last_index] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setCurrentLastIndex($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->current_last_index !== $v || $v === 0) {
+            $this->current_last_index = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::CURRENT_LAST_INDEX;
+        }
+
+    } // setCurrentLastIndex()
+
+    /**
+     * Set the value of [unassigned] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setUnassigned($v)
+    {
+
+        // Since the native PHP type for this column is integer,
+        // we will cast the input value to an int (if it is not).
+        if ($v !== null && !is_int($v) && is_numeric($v)) {
+            $v = (int) $v;
+        }
+
+        if ($this->unassigned !== $v || $v === 0) {
+            $this->unassigned = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::UNASSIGNED;
+        }
+
+    } // setUnassigned()
+
+    /**
+     * Set the value of [status] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setStatus($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->status !== $v || $v === 'pending') {
+            $this->status = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::STATUS;
+        }
+
+    } // setStatus()
+
+    /**
+     * Set the value of [msg_error] column.
+     * 
+     * @param      string $v new value
+     * @return     void
+     */
+    public function setMsgError($v)
+    {
+
+        // Since the native PHP type for this column is string,
+        // we will cast the input to a string (if it is not).
+        if ($v !== null && !is_string($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->msg_error !== $v) {
+            $this->msg_error = $v;
+            $this->modifiedColumns[] = GmailRelabelingPeer::MSG_ERROR;
+        }
+
+    } // setMsgError()
+
+    /**
+     * Hydrates (populates) the object variables with values from the database resultset.
+     *
+     * An offset (1-based "start column") is specified so that objects can be hydrated
+     * with a subset of the columns in the resultset rows.  This is needed, for example,
+     * for results of JOIN queries where the resultset row includes columns from two or
+     * more tables.
+     *
+     * @param      ResultSet $rs The ResultSet class with cursor advanced to desired record pos.
+     * @param      int $startcol 1-based offset column which indicates which restultset column to start with.
+     * @return     int next starting column
+     * @throws     PropelException  - Any caught Exception will be rewrapped as a PropelException.
+     */
+    public function hydrate(ResultSet $rs, $startcol = 1)
+    {
+        try {
+
+            $this->labeling_uid = $rs->getString($startcol + 0);
+
+            $this->create_date = $rs->getTimestamp($startcol + 1, null);
+
+            $this->app_uid = $rs->getString($startcol + 2);
+
+            $this->del_index = $rs->getInt($startcol + 3);
+
+            $this->current_last_index = $rs->getInt($startcol + 4);
+
+            $this->unassigned = $rs->getInt($startcol + 5);
+
+            $this->status = $rs->getString($startcol + 6);
+
+            $this->msg_error = $rs->getString($startcol + 7);
+
+            $this->resetModified();
+
+            $this->setNew(false);
+
+            // FIXME - using NUM_COLUMNS may be clearer.
+            return $startcol + 8; // 8 = GmailRelabelingPeer::NUM_COLUMNS - GmailRelabelingPeer::NUM_LAZY_LOAD_COLUMNS).
+
+        } catch (Exception $e) {
+            throw new PropelException("Error populating GmailRelabeling object", $e);
+        }
+    }
+
+    /**
+     * Removes this object from datastore and sets delete attribute.
+     *
+     * @param      Connection $con
+     * @return     void
+     * @throws     PropelException
+     * @see        BaseObject::setDeleted()
+     * @see        BaseObject::isDeleted()
+     */
+    public function delete($con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("This object has already been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getConnection(GmailRelabelingPeer::DATABASE_NAME);
+        }
+
+        try {
+            $con->begin();
+            GmailRelabelingPeer::doDelete($this, $con);
+            $this->setDeleted(true);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Stores the object in the database.  If the object is new,
+     * it inserts it; otherwise an update is performed.  This method
+     * wraps the doSave() worker method in a transaction.
+     *
+     * @param      Connection $con
+     * @return     int The number of rows affected by this insert/update
+     * @throws     PropelException
+     * @see        doSave()
+     */
+    public function save($con = null)
+    {
+        if ($this->isDeleted()) {
+            throw new PropelException("You cannot save an object that has been deleted.");
+        }
+
+        if ($con === null) {
+            $con = Propel::getConnection(GmailRelabelingPeer::DATABASE_NAME);
+        }
+
+        try {
+            $con->begin();
+            $affectedRows = $this->doSave($con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Stores the object in the database.
+     *
+     * If the object is new, it inserts it; otherwise an update is performed.
+     * All related objects are also updated in this method.
+     *
+     * @param      Connection $con
+     * @return     int The number of rows affected by this insert/update and any referring
+     * @throws     PropelException
+     * @see        save()
+     */
+    protected function doSave($con)
+    {
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        if (!$this->alreadyInSave) {
+            $this->alreadyInSave = true;
+
+
+            // If this object has been modified, then save it to the database.
+            if ($this->isModified()) {
+                if ($this->isNew()) {
+                    $pk = GmailRelabelingPeer::doInsert($this, $con);
+                    $affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
+                                         // should always be true here (even though technically
+                                         // BasePeer::doInsert() can insert multiple rows).
+
+                    $this->setNew(false);
+                } else {
+                    $affectedRows += GmailRelabelingPeer::doUpdate($this, $con);
+                }
+                $this->resetModified(); // [HL] After being saved an object is no longer 'modified'
+            }
+
+            $this->alreadyInSave = false;
+        }
+        return $affectedRows;
+    } // doSave()
+
+    /**
+     * Array of ValidationFailed objects.
+     * @var        array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return     array ValidationFailed[]
+     * @see        validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
+     * Validates the objects modified field values and all objects related to this table.
+     *
+     * If $columns is either a column name or an array of column names
+     * only those columns are validated.
+     *
+     * @param      mixed $columns Column name or an array of column names.
+     * @return     boolean Whether all columns pass validation.
+     * @see        doValidate()
+     * @see        getValidationFailures()
+     */
+    public function validate($columns = null)
+    {
+        $res = $this->doValidate($columns);
+        if ($res === true) {
+            $this->validationFailures = array();
+            return true;
+        } else {
+            $this->validationFailures = $res;
+            return false;
+        }
+    }
+
+    /**
+     * This function performs the validation work for complex object models.
+     *
+     * In addition to checking the current object, all related objects will
+     * also be validated.  If all pass then <code>true</code> is returned; otherwise
+     * an aggreagated array of ValidationFailed objects will be returned.
+     *
+     * @param      array $columns Array of column names to validate.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
+     */
+    protected function doValidate($columns = null)
+    {
+        if (!$this->alreadyInValidation) {
+            $this->alreadyInValidation = true;
+            $retval = null;
+
+            $failureMap = array();
+
+
+            if (($retval = GmailRelabelingPeer::doValidate($this, $columns)) !== true) {
+                $failureMap = array_merge($failureMap, $retval);
+            }
+
+
+
+            $this->alreadyInValidation = false;
+        }
+
+        return (!empty($failureMap) ? $failureMap : true);
+    }
+
+    /**
+     * Retrieves a field from the object by name passed in as a string.
+     *
+     * @param      string $name name
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TYPE_PHPNAME,
+     *                     TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     mixed Value of field.
+     */
+    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
+    {
+        $pos = GmailRelabelingPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
+        return $this->getByPosition($pos);
+    }
+
+    /**
+     * Retrieves a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @return     mixed Value of field at $pos
+     */
+    public function getByPosition($pos)
+    {
+        switch($pos) {
+            case 0:
+                return $this->getLabelingUid();
+                break;
+            case 1:
+                return $this->getCreateDate();
+                break;
+            case 2:
+                return $this->getAppUid();
+                break;
+            case 3:
+                return $this->getDelIndex();
+                break;
+            case 4:
+                return $this->getCurrentLastIndex();
+                break;
+            case 5:
+                return $this->getUnassigned();
+                break;
+            case 6:
+                return $this->getStatus();
+                break;
+            case 7:
+                return $this->getMsgError();
+                break;
+            default:
+                return null;
+                break;
+        } // switch()
+    }
+
+    /**
+     * Exports the object as an array.
+     *
+     * You can specify the key type of the array by passing one of the class
+     * type constants.
+     *
+     * @param      string $keyType One of the class type constants TYPE_PHPNAME,
+     *                        TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     an associative array containing the field names (as keys) and field values
+     */
+    public function toArray($keyType = BasePeer::TYPE_PHPNAME)
+    {
+        $keys = GmailRelabelingPeer::getFieldNames($keyType);
+        $result = array(
+            $keys[0] => $this->getLabelingUid(),
+            $keys[1] => $this->getCreateDate(),
+            $keys[2] => $this->getAppUid(),
+            $keys[3] => $this->getDelIndex(),
+            $keys[4] => $this->getCurrentLastIndex(),
+            $keys[5] => $this->getUnassigned(),
+            $keys[6] => $this->getStatus(),
+            $keys[7] => $this->getMsgError(),
+        );
+        return $result;
+    }
+
+    /**
+     * Sets a field from the object by name passed in as a string.
+     *
+     * @param      string $name peer name
+     * @param      mixed $value field value
+     * @param      string $type The type of fieldname the $name is of:
+     *                     one of the class type constants TYPE_PHPNAME,
+     *                     TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     void
+     */
+    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
+    {
+        $pos = GmailRelabelingPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
+        return $this->setByPosition($pos, $value);
+    }
+
+    /**
+     * Sets a field from the object by Position as specified in the xml schema.
+     * Zero-based.
+     *
+     * @param      int $pos position in xml schema
+     * @param      mixed $value field value
+     * @return     void
+     */
+    public function setByPosition($pos, $value)
+    {
+        switch($pos) {
+            case 0:
+                $this->setLabelingUid($value);
+                break;
+            case 1:
+                $this->setCreateDate($value);
+                break;
+            case 2:
+                $this->setAppUid($value);
+                break;
+            case 3:
+                $this->setDelIndex($value);
+                break;
+            case 4:
+                $this->setCurrentLastIndex($value);
+                break;
+            case 5:
+                $this->setUnassigned($value);
+                break;
+            case 6:
+                $this->setStatus($value);
+                break;
+            case 7:
+                $this->setMsgError($value);
+                break;
+        } // switch()
+    }
+
+    /**
+     * Populates the object using an array.
+     *
+     * This is particularly useful when populating an object from one of the
+     * request arrays (e.g. $_POST).  This method goes through the column
+     * names, checking to see whether a matching key exists in populated
+     * array. If so the setByName() method is called for that column.
+     *
+     * You can specify the key type of the array by additionally passing one
+     * of the class type constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME,
+     * TYPE_NUM. The default key type is the column's phpname (e.g. 'authorId')
+     *
+     * @param      array  $arr     An array to populate the object from.
+     * @param      string $keyType The type of keys the array uses.
+     * @return     void
+     */
+    public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME)
+    {
+        $keys = GmailRelabelingPeer::getFieldNames($keyType);
+
+        if (array_key_exists($keys[0], $arr)) {
+            $this->setLabelingUid($arr[$keys[0]]);
+        }
+
+        if (array_key_exists($keys[1], $arr)) {
+            $this->setCreateDate($arr[$keys[1]]);
+        }
+
+        if (array_key_exists($keys[2], $arr)) {
+            $this->setAppUid($arr[$keys[2]]);
+        }
+
+        if (array_key_exists($keys[3], $arr)) {
+            $this->setDelIndex($arr[$keys[3]]);
+        }
+
+        if (array_key_exists($keys[4], $arr)) {
+            $this->setCurrentLastIndex($arr[$keys[4]]);
+        }
+
+        if (array_key_exists($keys[5], $arr)) {
+            $this->setUnassigned($arr[$keys[5]]);
+        }
+
+        if (array_key_exists($keys[6], $arr)) {
+            $this->setStatus($arr[$keys[6]]);
+        }
+
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setMsgError($arr[$keys[7]]);
+        }
+
+    }
+
+    /**
+     * Build a Criteria object containing the values of all modified columns in this object.
+     *
+     * @return     Criteria The Criteria object containing all modified values.
+     */
+    public function buildCriteria()
+    {
+        $criteria = new Criteria(GmailRelabelingPeer::DATABASE_NAME);
+
+        if ($this->isColumnModified(GmailRelabelingPeer::LABELING_UID)) {
+            $criteria->add(GmailRelabelingPeer::LABELING_UID, $this->labeling_uid);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::CREATE_DATE)) {
+            $criteria->add(GmailRelabelingPeer::CREATE_DATE, $this->create_date);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::APP_UID)) {
+            $criteria->add(GmailRelabelingPeer::APP_UID, $this->app_uid);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::DEL_INDEX)) {
+            $criteria->add(GmailRelabelingPeer::DEL_INDEX, $this->del_index);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::CURRENT_LAST_INDEX)) {
+            $criteria->add(GmailRelabelingPeer::CURRENT_LAST_INDEX, $this->current_last_index);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::UNASSIGNED)) {
+            $criteria->add(GmailRelabelingPeer::UNASSIGNED, $this->unassigned);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::STATUS)) {
+            $criteria->add(GmailRelabelingPeer::STATUS, $this->status);
+        }
+
+        if ($this->isColumnModified(GmailRelabelingPeer::MSG_ERROR)) {
+            $criteria->add(GmailRelabelingPeer::MSG_ERROR, $this->msg_error);
+        }
+
+
+        return $criteria;
+    }
+
+    /**
+     * Builds a Criteria object containing the primary key for this object.
+     *
+     * Unlike buildCriteria() this method includes the primary key values regardless
+     * of whether or not they have been modified.
+     *
+     * @return     Criteria The Criteria object containing value(s) for primary key(s).
+     */
+    public function buildPkeyCriteria()
+    {
+        $criteria = new Criteria(GmailRelabelingPeer::DATABASE_NAME);
+
+        $criteria->add(GmailRelabelingPeer::LABELING_UID, $this->labeling_uid);
+
+        return $criteria;
+    }
+
+    /**
+     * Returns the primary key for this object (row).
+     * @return     string
+     */
+    public function getPrimaryKey()
+    {
+        return $this->getLabelingUid();
+    }
+
+    /**
+     * Generic method to set the primary key (labeling_uid column).
+     *
+     * @param      string $key Primary key.
+     * @return     void
+     */
+    public function setPrimaryKey($key)
+    {
+        $this->setLabelingUid($key);
+    }
+
+    /**
+     * Sets contents of passed object to values from current object.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      object $copyObj An object of GmailRelabeling (or compatible) type.
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @throws     PropelException
+     */
+    public function copyInto($copyObj, $deepCopy = false)
+    {
+
+        $copyObj->setCreateDate($this->create_date);
+
+        $copyObj->setAppUid($this->app_uid);
+
+        $copyObj->setDelIndex($this->del_index);
+
+        $copyObj->setCurrentLastIndex($this->current_last_index);
+
+        $copyObj->setUnassigned($this->unassigned);
+
+        $copyObj->setStatus($this->status);
+
+        $copyObj->setMsgError($this->msg_error);
+
+
+        $copyObj->setNew(true);
+
+        $copyObj->setLabelingUid(NULL); // this is a pkey column, so set to default value
+
+    }
+
+    /**
+     * Makes a copy of this object that will be inserted as a new row in table when saved.
+     * It creates a new object filling in the simple attributes, but skipping any primary
+     * keys that are defined for the table.
+     *
+     * If desired, this method can also make copies of all associated (fkey referrers)
+     * objects.
+     *
+     * @param      boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+     * @return     GmailRelabeling Clone of current object.
+     * @throws     PropelException
+     */
+    public function copy($deepCopy = false)
+    {
+        // we use get_class(), because this might be a subclass
+        $clazz = get_class($this);
+        $copyObj = new $clazz();
+        $this->copyInto($copyObj, $deepCopy);
+        return $copyObj;
+    }
+
+    /**
+     * Returns a peer instance associated with this om.
+     *
+     * Since Peer classes are not to have any instance attributes, this method returns the
+     * same instance for all member of this class. The method could therefore
+     * be static, but this would prevent one from overriding the behavior.
+     *
+     * @return     GmailRelabelingPeer
+     */
+    public function getPeer()
+    {
+        if (self::$peer === null) {
+            self::$peer = new GmailRelabelingPeer();
+        }
+        return self::$peer;
+    }
+}
+

workflow/engine/classes/model/om/BaseGmailRelabelingPeer.php

@@ -0,0 +1,602 @@
+<?php
+
+require_once 'propel/util/BasePeer.php';
+// The object class -- needed for instanceof checks in this class.
+// actual class may be a subclass -- as returned by GmailRelabelingPeer::getOMClass()
+include_once 'classes/model/GmailRelabeling.php';
+
+/**
+ * Base static class for performing query and update operations on the 'GMAIL_RELABELING' table.
+ *
+ * 
+ *
+ * @package    workflow.classes.model.om
+ */
+abstract class BaseGmailRelabelingPeer
+{
+
+    /** the default database name for this class */
+    const DATABASE_NAME = 'workflow';
+
+    /** the table name for this class */
+    const TABLE_NAME = 'GMAIL_RELABELING';
+
+    /** A class that can be returned by this peer. */
+    const CLASS_DEFAULT = 'classes.model.GmailRelabeling';
+
+    /** The total number of columns. */
+    const NUM_COLUMNS = 8;
+
+    /** The number of lazy-loaded columns. */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+
+    /** the column name for the LABELING_UID field */
+    const LABELING_UID = 'GMAIL_RELABELING.LABELING_UID';
+
+    /** the column name for the CREATE_DATE field */
+    const CREATE_DATE = 'GMAIL_RELABELING.CREATE_DATE';
+
+    /** the column name for the APP_UID field */
+    const APP_UID = 'GMAIL_RELABELING.APP_UID';
+
+    /** the column name for the DEL_INDEX field */
+    const DEL_INDEX = 'GMAIL_RELABELING.DEL_INDEX';
+
+    /** the column name for the CURRENT_LAST_INDEX field */
+    const CURRENT_LAST_INDEX = 'GMAIL_RELABELING.CURRENT_LAST_INDEX';
+
+    /** the column name for the UNASSIGNED field */
+    const UNASSIGNED = 'GMAIL_RELABELING.UNASSIGNED';
+
+    /** the column name for the STATUS field */
+    const STATUS = 'GMAIL_RELABELING.STATUS';
+
+    /** the column name for the MSG_ERROR field */
+    const MSG_ERROR = 'GMAIL_RELABELING.MSG_ERROR';
+
+    /** The PHP to DB Name Mapping */
+    private static $phpNameMap = null;
+
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    private static $fieldNames = array (
+        BasePeer::TYPE_PHPNAME => array ('LabelingUid', 'CreateDate', 'AppUid', 'DelIndex', 'CurrentLastIndex', 'Unassigned', 'Status', 'MsgError', ),
+        BasePeer::TYPE_COLNAME => array (GmailRelabelingPeer::LABELING_UID, GmailRelabelingPeer::CREATE_DATE, GmailRelabelingPeer::APP_UID, GmailRelabelingPeer::DEL_INDEX, GmailRelabelingPeer::CURRENT_LAST_INDEX, GmailRelabelingPeer::UNASSIGNED, GmailRelabelingPeer::STATUS, GmailRelabelingPeer::MSG_ERROR, ),
+        BasePeer::TYPE_FIELDNAME => array ('LABELING_UID', 'CREATE_DATE', 'APP_UID', 'DEL_INDEX', 'CURRENT_LAST_INDEX', 'UNASSIGNED', 'STATUS', 'MSG_ERROR', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
+     */
+    private static $fieldKeys = array (
+        BasePeer::TYPE_PHPNAME => array ('LabelingUid' => 0, 'CreateDate' => 1, 'AppUid' => 2, 'DelIndex' => 3, 'CurrentLastIndex' => 4, 'Unassigned' => 5, 'Status' => 6, 'MsgError' => 7, ),
+        BasePeer::TYPE_COLNAME => array (GmailRelabelingPeer::LABELING_UID => 0, GmailRelabelingPeer::CREATE_DATE => 1, GmailRelabelingPeer::APP_UID => 2, GmailRelabelingPeer::DEL_INDEX => 3, GmailRelabelingPeer::CURRENT_LAST_INDEX => 4, GmailRelabelingPeer::UNASSIGNED => 5, GmailRelabelingPeer::STATUS => 6, GmailRelabelingPeer::MSG_ERROR => 7, ),
+        BasePeer::TYPE_FIELDNAME => array ('LABELING_UID' => 0, 'CREATE_DATE' => 1, 'APP_UID' => 2, 'DEL_INDEX' => 3, 'CURRENT_LAST_INDEX' => 4, 'UNASSIGNED' => 5, 'STATUS' => 6, 'MSG_ERROR' => 7, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
+    );
+
+    /**
+     * @return     MapBuilder the map builder for this peer
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function getMapBuilder()
+    {
+        include_once 'classes/model/map/GmailRelabelingMapBuilder.php';
+        return BasePeer::getMapBuilder('classes.model.map.GmailRelabelingMapBuilder');
+    }
+    /**
+     * Gets a map (hash) of PHP names to DB column names.
+     *
+     * @return     array The PHP to DB name map for this peer
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     * @deprecated Use the getFieldNames() and translateFieldName() methods instead of this.
+     */
+    public static function getPhpNameMap()
+    {
+        if (self::$phpNameMap === null) {
+            $map = GmailRelabelingPeer::getTableMap();
+            $columns = $map->getColumns();
+            $nameMap = array();
+            foreach ($columns as $column) {
+                $nameMap[$column->getPhpName()] = $column->getColumnName();
+            }
+            self::$phpNameMap = $nameMap;
+        }
+        return self::$phpNameMap;
+    }
+    /**
+     * Translates a fieldname to another type
+     *
+     * @param      string $name field name
+     * @param      string $fromType One of the class type constants TYPE_PHPNAME,
+     *                         TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @param      string $toType   One of the class type constants
+     * @return     string translated name of the field.
+     */
+    static public function translateFieldName($name, $fromType, $toType)
+    {
+        $toNames = self::getFieldNames($toType);
+        $key = isset(self::$fieldKeys[$fromType][$name]) ? self::$fieldKeys[$fromType][$name] : null;
+        if ($key === null) {
+            throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(self::$fieldKeys[$fromType], true));
+        }
+        return $toNames[$key];
+    }
+
+    /**
+     * Returns an array of of field names.
+     *
+     * @param      string $type The type of fieldnames to return:
+     *                      One of the class type constants TYPE_PHPNAME,
+     *                      TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM
+     * @return     array A list of field names
+     */
+
+    static public function getFieldNames($type = BasePeer::TYPE_PHPNAME)
+    {
+        if (!array_key_exists($type, self::$fieldNames)) {
+            throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants TYPE_PHPNAME, TYPE_COLNAME, TYPE_FIELDNAME, TYPE_NUM. ' . $type . ' was given.');
+        }
+        return self::$fieldNames[$type];
+    }
+
+    /**
+     * Convenience method which changes table.column to alias.column.
+     *
+     * Using this method you can maintain SQL abstraction while using column aliases.
+     * <code>
+     *      $c->addAlias("alias1", TablePeer::TABLE_NAME);
+     *      $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
+     * </code>
+     * @param      string $alias The alias for the current table.
+     * @param      string $column The column name for current table. (i.e. GmailRelabelingPeer::COLUMN_NAME).
+     * @return     string
+     */
+    public static function alias($alias, $column)
+    {
+        return str_replace(GmailRelabelingPeer::TABLE_NAME.'.', $alias.'.', $column);
+    }
+
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param      criteria object containing the columns to add.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria)
+    {
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::LABELING_UID);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::CREATE_DATE);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::APP_UID);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::DEL_INDEX);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::CURRENT_LAST_INDEX);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::UNASSIGNED);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::STATUS);
+
+        $criteria->addSelectColumn(GmailRelabelingPeer::MSG_ERROR);
+
+    }
+
+    const COUNT = 'COUNT(GMAIL_RELABELING.LABELING_UID)';
+    const COUNT_DISTINCT = 'COUNT(DISTINCT GMAIL_RELABELING.LABELING_UID)';
+
+    /**
+     * Returns the number of rows matching criteria.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct Whether to select only distinct columns (You can also set DISTINCT modifier in Criteria).
+     * @param      Connection $con
+     * @return     int Number of matching rows.
+     */
+    public static function doCount(Criteria $criteria, $distinct = false, $con = null)
+    {
+        // we're going to modify criteria, so copy it first
+        $criteria = clone $criteria;
+
+        // clear out anything that might confuse the ORDER BY clause
+        $criteria->clearSelectColumns()->clearOrderByColumns();
+        if ($distinct || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) {
+            $criteria->addSelectColumn(GmailRelabelingPeer::COUNT_DISTINCT);
+        } else {
+            $criteria->addSelectColumn(GmailRelabelingPeer::COUNT);
+        }
+
+        // just in case we're grouping: add those columns to the select statement
+        foreach ($criteria->getGroupByColumns() as $column) {
+            $criteria->addSelectColumn($column);
+        }
+
+        $rs = GmailRelabelingPeer::doSelectRS($criteria, $con);
+        if ($rs->next()) {
+            return $rs->getInt(1);
+        } else {
+            // no rows returned; we infer that means 0 matches.
+            return 0;
+        }
+    }
+    /**
+     * Method to select one object from the DB.
+     *
+     * @param      Criteria $criteria object used to create the SELECT statement.
+     * @param      Connection $con
+     * @return     GmailRelabeling
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doSelectOne(Criteria $criteria, $con = null)
+    {
+        $critcopy = clone $criteria;
+        $critcopy->setLimit(1);
+        $objects = GmailRelabelingPeer::doSelect($critcopy, $con);
+        if ($objects) {
+            return $objects[0];
+        }
+        return null;
+    }
+    /**
+     * Method to do selects.
+     *
+     * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+     * @param      Connection $con
+     * @return     array Array of selected Objects
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doSelect(Criteria $criteria, $con = null)
+    {
+        return GmailRelabelingPeer::populateObjects(GmailRelabelingPeer::doSelectRS($criteria, $con));
+    }
+    /**
+     * Prepares the Criteria object and uses the parent doSelect()
+     * method to get a ResultSet.
+     *
+     * Use this method directly if you want to just get the resultset
+     * (instead of an array of objects).
+     *
+     * @param      Criteria $criteria The Criteria object used to build the SELECT statement.
+     * @param      Connection $con the connection to use
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     * @return     ResultSet The resultset object with numerically-indexed fields.
+     * @see        BasePeer::doSelect()
+     */
+    public static function doSelectRS(Criteria $criteria, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        if (!$criteria->getSelectColumns()) {
+            $criteria = clone $criteria;
+            GmailRelabelingPeer::addSelectColumns($criteria);
+        }
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        // BasePeer returns a Creole ResultSet, set to return
+        // rows indexed numerically.
+        return BasePeer::doSelect($criteria, $con);
+    }
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(ResultSet $rs)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = GmailRelabelingPeer::getOMClass();
+        $cls = Propel::import($cls);
+        // populate the object(s)
+        while ($rs->next()) {
+
+            $obj = new $cls();
+            $obj->hydrate($rs);
+            $results[] = $obj;
+
+        }
+        return $results;
+    }
+    /**
+     * Returns the TableMap related to this peer.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return     TableMap
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
+    }
+
+    /**
+     * The class that the Peer will make instances of.
+     *
+     * This uses a dot-path notation which is tranalted into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @return     string path.to.ClassName
+     */
+    public static function getOMClass()
+    {
+        return GmailRelabelingPeer::CLASS_DEFAULT;
+    }
+
+    /**
+     * Method perform an INSERT on the database, given a GmailRelabeling or Criteria object.
+     *
+     * @param      mixed $values Criteria or GmailRelabeling object containing data that is used to create the INSERT statement.
+     * @param      Connection $con the connection to use
+     * @return     mixed The new primary key.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+        } else {
+            $criteria = $values->buildCriteria(); // build Criteria from GmailRelabeling object
+        }
+
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table (I guess, conceivably)
+            $con->begin();
+            $pk = BasePeer::doInsert($criteria, $con);
+            $con->commit();
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+
+        return $pk;
+    }
+
+    /**
+     * Method perform an UPDATE on the database, given a GmailRelabeling or Criteria object.
+     *
+     * @param      mixed $values Criteria or GmailRelabeling object containing data create the UPDATE statement.
+     * @param      Connection $con The connection to use (specify Connection exert more control over transactions).
+     * @return     int The number of affected rows (if supported by underlying database driver).
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function doUpdate($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $selectCriteria = new Criteria(self::DATABASE_NAME);
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+
+            $comparison = $criteria->getComparison(GmailRelabelingPeer::LABELING_UID);
+            $selectCriteria->add(GmailRelabelingPeer::LABELING_UID, $criteria->remove(GmailRelabelingPeer::LABELING_UID), $comparison);
+
+        } else {
+            $criteria = $values->buildCriteria(); // gets full criteria
+            $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
+        }
+
+        // set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        return BasePeer::doUpdate($selectCriteria, $criteria, $con);
+    }
+
+    /**
+     * Method to DELETE all rows from the GMAIL_RELABELING table.
+     *
+     * @return     int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll($con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+        $affectedRows = 0; // initialize var to track total num of affected rows
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->begin();
+            $affectedRows += BasePeer::doDeleteAll(GmailRelabelingPeer::TABLE_NAME, $con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Method perform a DELETE on the database, given a GmailRelabeling or Criteria object OR a primary key value.
+     *
+     * @param      mixed $values Criteria or GmailRelabeling object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param      Connection $con the connection to use
+     * @return     int  The number of affected rows (if supported by underlying database driver).
+     *             This includes CASCADE-related rows
+     *              if supported by native driver or if emulated using Propel.
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+    */
+    public static function doDelete($values, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(GmailRelabelingPeer::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            $criteria = clone $values; // rename for clarity
+        } elseif ($values instanceof GmailRelabeling) {
+
+            $criteria = $values->buildPkeyCriteria();
+        } else {
+            // it must be the primary key
+            $criteria = new Criteria(self::DATABASE_NAME);
+            $criteria->add(GmailRelabelingPeer::LABELING_UID, (array) $values, Criteria::IN);
+        }
+
+        // Set the correct dbName
+        $criteria->setDbName(self::DATABASE_NAME);
+
+        $affectedRows = 0; // initialize var to track total num of affected rows
+
+        try {
+            // use transaction because $criteria could contain info
+            // for more than one table or we could emulating ON DELETE CASCADE, etc.
+            $con->begin();
+
+            $affectedRows += BasePeer::doDelete($criteria, $con);
+            $con->commit();
+            return $affectedRows;
+        } catch (PropelException $e) {
+            $con->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * Validates all modified columns of given GmailRelabeling object.
+     * If parameter $columns is either a single column name or an array of column names
+     * than only those columns are validated.
+     *
+     * NOTICE: This does not apply to primary or foreign keys for now.
+     *
+     * @param      GmailRelabeling $obj The object to validate.
+     * @param      mixed $cols Column name or array of column names.
+     *
+     * @return     mixed TRUE if all columns are valid or the error message of the first invalid column.
+     */
+    public static function doValidate(GmailRelabeling $obj, $cols = null)
+    {
+        $columns = array();
+
+        if ($cols) {
+            $dbMap = Propel::getDatabaseMap(GmailRelabelingPeer::DATABASE_NAME);
+            $tableMap = $dbMap->getTable(GmailRelabelingPeer::TABLE_NAME);
+
+            if (! is_array($cols)) {
+                $cols = array($cols);
+            }
+
+            foreach ($cols as $colName) {
+                if ($tableMap->containsColumn($colName)) {
+                    $get = 'get' . $tableMap->getColumn($colName)->getPhpName();
+                    $columns[$colName] = $obj->$get();
+                }
+            }
+        } else {
+
+        }
+
+        return BasePeer::doValidate(GmailRelabelingPeer::DATABASE_NAME, GmailRelabelingPeer::TABLE_NAME, $columns);
+    }
+
+    /**
+     * Retrieve a single object by pkey.
+     *
+     * @param      mixed $pk the primary key.
+     * @param      Connection $con the connection to use
+     * @return     GmailRelabeling
+     */
+    public static function retrieveByPK($pk, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $criteria = new Criteria(GmailRelabelingPeer::DATABASE_NAME);
+
+        $criteria->add(GmailRelabelingPeer::LABELING_UID, $pk);
+
+
+        $v = GmailRelabelingPeer::doSelect($criteria, $con);
+
+        return !empty($v) > 0 ? $v[0] : null;
+    }
+
+    /**
+     * Retrieve multiple objects by pkey.
+     *
+     * @param      array $pks List of primary keys
+     * @param      Connection $con the connection to use
+     * @throws     PropelException Any exceptions caught during processing will be
+     *       rethrown wrapped into a PropelException.
+     */
+    public static function retrieveByPKs($pks, $con = null)
+    {
+        if ($con === null) {
+            $con = Propel::getConnection(self::DATABASE_NAME);
+        }
+
+        $objs = null;
+        if (empty($pks)) {
+            $objs = array();
+        } else {
+            $criteria = new Criteria();
+            $criteria->add(GmailRelabelingPeer::LABELING_UID, $pks, Criteria::IN);
+            $objs = GmailRelabelingPeer::doSelect($criteria, $con);
+        }
+        return $objs;
+    }
+}
+
+
+// static code to register the map builder for this Peer with the main Propel class
+if (Propel::isInit()) {
+    // the MapBuilder classes register themselves with Propel during initialization
+    // so we need to load them here.
+    try {
+        BaseGmailRelabelingPeer::getMapBuilder();
+    } catch (Exception $e) {
+        Propel::log('Could not initialize Peer: ' . $e->getMessage(), Propel::LOG_ERR);
+    }
+} else {
+    // even if Propel is not yet initialized, the map builder class can be registered
+    // now and then it will be loaded when Propel initializes.
+    require_once 'classes/model/map/GmailRelabelingMapBuilder.php';
+    Propel::registerMapBuilder('classes.model.map.GmailRelabelingMapBuilder');
+}
+

workflow/engine/config/schema.xml

@@ -191,6 +191,18 @@
             <parameter name="Extra" value=""/>
         </vendor>
     </column>
+    <column name="SYNC_WITH_DRIVE" type="VARCHAR" size="32" required="true" default="UNSYNCHRONIZED"/>
+    <column name="SYNC_PERMISSIONS" type="LONGVARCHAR" required="false">
+        <vendor type="mysql">
+            <parameter name="Field" value="SYNC_PERMISSIONS"/>
+            <parameter name="Type" value="MEDIUMTEXT"/>
+            <parameter name="Null" value="YES"/>
+            <parameter name="Key" value=""/>
+            <parameter name="Default" value=""/>
+            <parameter name="Extra" value=""/>
+        </vendor>
+    </column>
+
     <validator column="APP_DOC_UID">
       <rule name="maxLength" value="32" message="Application Document UID can be no larger than ${value} in size"/>
       <rule name="required" message="Application Document UID is required."/>
@@ -222,6 +234,10 @@
       <rule name="validValues" value="ACTIVE|DELETED" message="Please select a valid document status (ACTIVE|DELETED)."/>
       <rule name="required" message="Application Document Status is required."/>
     </validator>
+    <validator column="SYNC_WITH_DRIVE">
+        <rule name="validValues" value="SYNCHRONIZED|UNSYNCHRONIZED|NO_EXIST_FILE_PM" message="Please select a valid type."/>
+        <rule name="required" message="Type is required."/>
+    </validator>
 
     <index name="indexAppDocument">
       <index-column name="FOLDER_UID"/>
@@ -5250,4 +5266,31 @@
       </vendor>
     </index>
   </table>
+
+    <table name="GMAIL_RELABELING">
+        <vendor type="mysql">
+        <parameter name="Name" value="GMAIL_RELABELING"/>
+          <parameter name="Engine" value="InnoDB" />
+          <parameter name="Version" value="10" />
+          <parameter name="Row_format" value="Dynamic" />
+          <parameter name="Data_free" value="0" />
+          <parameter name="Auto_increment" value="" />
+          <parameter name="Check_time" value="" />
+          <parameter name="Collation" value="utf8_general_ci" />
+          <parameter name="Checksum" value="" />
+          <parameter name="Create_options" value="" />
+          <parameter name="Comment" value="Task for label relabaling"/>
+        </vendor>
+        <column name="LABELING_UID" type="VARCHAR" size="32" required="true"  primaryKey="true"/>
+        <column name="CREATE_DATE" type="TIMESTAMP" required="true"/>
+        <column name="APP_UID" type="VARCHAR" size="32" required="true"  default=""/>
+        <column name="DEL_INDEX" type="INTEGER" required="true"   default="0"/>
+        <column name="CURRENT_LAST_INDEX" type="INTEGER" required="true"  default="0"/>
+        <column name="UNASSIGNED" type="INTEGER" required="true"  default="0"/>
+        <column name="STATUS" type="VARCHAR" size="32" required="true"  default="pending"/>
+        <column name="MSG_ERROR" type="LONGVARCHAR"/>
+        <index name="indexStatus">
+            <index-column name="STATUS"/>
+        </index>
+    </table>
 </database>

workflow/engine/controllers/pmGmail.php

@@ -16,29 +16,28 @@ class pmGmail extends Controller
         $result = new StdClass();
         $result->success = true;
 
-        if (!empty($httpData->status_pmgmail)) {
+        $httpData->serviceGmailStatus = !empty($httpData->serviceGmailStatus) ? $httpData->serviceGmailStatus == 1 ? true : false : false;
-            $httpData->status_pmgmail = $httpData->status_pmgmail == 1 ? true : false;
+        $httpData->serviceDriveStatus = !empty($httpData->serviceDriveStatus) ? $httpData->serviceDriveStatus == 1 ? true : false : false;
-            $pmGoogle->setStatusService($httpData->status_pmgmail);
-            $message = G::LoadTranslation('ID_ENABLE_PMGMAIL') . ': ' . ($httpData->status_pmgmail ? G::LoadTranslation('ID_ENABLE') : G::LoadTranslation('ID_DISABLE'));
 
-            $pmGoogle->setTypeAuthentication($httpData->typeAuth);
+        if ($httpData->serviceGmailStatus || $httpData->serviceDriveStatus) {
 
-            if (!empty($httpData->email_service_account)) {
+
-                $pmGoogle->setServiceAccountEmail($httpData->email_service_account);
+            $pmGoogle->setServiceGmailStatus($httpData->serviceGmailStatus);
-                $message .= ', ' . G::LoadTranslation('ID_PMG_EMAIL') . ': ' . $httpData->email_service_account;
+            $pmGoogle->setServiceDriveStatus($httpData->serviceDriveStatus);
+
+            $message = G::LoadTranslation('ID_ENABLE_PMGMAIL') . ': ' . ($httpData->serviceGmailStatus ? G::LoadTranslation('ID_ENABLE') : G::LoadTranslation('ID_DISABLE'));
+            $message .= G::LoadTranslation('ID_ENABLE_PMDRIVE') . ': ' . ($httpData->serviceDriveStatus ? G::LoadTranslation('ID_ENABLE') : G::LoadTranslation('ID_DISABLE'));
+
+            if (!empty($httpData->emailServiceAccount)) {
+                $pmGoogle->setServiceAccountEmail($httpData->emailServiceAccount);
+                $message .= ', ' . G::LoadTranslation('ID_PMG_EMAIL') . ': ' . $httpData->emailServiceAccount;
             }
             if (!empty($_FILES)) {
-                if (!empty($_FILES['file_p12']) && $_FILES['file_p12']['error'] != 1) {
+                if (!empty($_FILES['googleCertificate']) && $_FILES['googleCertificate']['error'] != 1) {
-                    if ($_FILES['file_p12']['tmp_name'] != '') {
+                    if ($_FILES['googleCertificate']['tmp_name'] != '') {
-                        G::uploadFile($_FILES['file_p12']['tmp_name'], PATH_DATA_SITE, $_FILES['file_p12']['name']);
+                        G::uploadFile($_FILES['googleCertificate']['tmp_name'], PATH_DATA_SITE, $_FILES['googleCertificate']['name']);
-                        $pmGoogle->setServiceAccountP12($_FILES['file_p12']['name']);
+                        $pmGoogle->setServiceAccountCertificate($_FILES['googleCertificate']['name']);
-                        $message .= ', ' . G::LoadTranslation('ID_PMG_FILE') . ': ' . $_FILES['file_p12']['name'];
+                        $message .= ', ' . G::LoadTranslation('ID_PMG_FILE') . ': ' . $_FILES['googleCertificate']['name'];
-                    }
-                } else if (!empty($_FILES['file_json']) && $_FILES['file_json']['error'] != 1) {
-                    if ($_FILES['file_json']['tmp_name'] != '') {
-                        G::uploadFile($_FILES['file_json']['tmp_name'], PATH_DATA_SITE, $_FILES['file_json']['name']);
-                        $pmGoogle->setAccountJson($_FILES['file_json']['name']);
-                        $message .= ', ' . G::LoadTranslation('ID_PMG_FILE') . ': ' . $_FILES['file_json']['name'];
                     }
                 } else {
                     $result->success = false;
@@ -48,7 +47,8 @@ class pmGmail extends Controller
                 }
             }
         } else {
-            $pmGoogle->setStatusService(false);
+            $pmGoogle->setServiceGmailStatus(false);
+            $pmGoogle->setServiceDriveStatus(false);
             $message = G::LoadTranslation('ID_ENABLE_PMGMAIL') . ': ' . G::LoadTranslation('ID_DISABLE');
         }
         G::auditLog("Update Settings Gmail", $message);
@@ -64,20 +64,29 @@ class pmGmail extends Controller
                 $this->setJSVar('__PMGMAIL_ERROR__', $_SESSION['__PMGMAIL_ERROR__']);
                 unset($_SESSION['__PMGMAIL_ERROR__']);
             }
-            G::LoadClass( "pmGoogleApi" );
+            G::LoadClass("pmGoogleApi");
             $pmGoogle = new PMGoogleApi();
             $accountEmail = $pmGoogle->getServiceAccountEmail();
-            $fileP12 = $pmGoogle->getServiceAccountP12();
+            $googleCertificate = $pmGoogle->getServiceAccountCertificate();
-            $fileJson = $pmGoogle->getAccountJson();
+            $statusGmail = $pmGoogle->getServiceGmailStatus();
-            $fileJson = $fileJson == null ? '' : $fileJson;
+            $statusDrive = $pmGoogle->getServiceDriveStatus();
-            $type = $pmGoogle->getTypeAuthentication();
+            $disableGmail = true;
-            $enablePMGmail = $pmGoogle->getStatusService();
+            $disableDrive = true;
+
+            $licensedFeatures = &PMLicensedFeatures::getSingleton();
+            if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+                $disableGmail = false;
+            }
+            if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+                $disableDrive = false;
+            }
 
             $this->setJSVar('accountEmail', $accountEmail);
-            $this->setJSVar('fileP12', $fileP12);
+            $this->setJSVar('googleCertificate', $googleCertificate);
-            $this->setJSVar('enablePMGmail', $enablePMGmail);
+            $this->setJSVar('statusGmail', $statusGmail);
-            $this->setJSVar('fileJson', $fileJson);
+            $this->setJSVar('statusDrive', $statusDrive);
-            $this->setJSVar('typeAuthentication', $type);
+            $this->setJSVar('disableGmail', $disableGmail);
+            $this->setJSVar('disableDrive', $disableDrive);
 
 
             G::RenderPage('publish', 'extJs');
@@ -97,13 +106,8 @@ class pmGmail extends Controller
 
         $result = new stdClass();
 
-        $result->typeAuth = empty($httpData->typeAuth) ? $pmGoogle->getTypeAuthentication() : $httpData->typeAuth;
+        $result->emailServiceAccount = empty($httpData->emailServiceAccount) ? $pmGoogle->getServiceAccountEmail() : $httpData->emailServiceAccount;
-        if ($result->typeAuth == 'webApplication') {
+        $result->pathServiceAccountCertificate = empty($_FILES['googleCertificate']['tmp_name']) ? PATH_DATA_SITE . $pmGoogle->getServiceAccountCertificate() : $_FILES['googleCertificate']['tmp_name'];
-            $result->pathFileJson = empty($_FILES['file_json']['tmp_name']) ? PATH_DATA_SITE . $pmGoogle->getAccountJson() : $_FILES['file_json']['tmp_name'];
-        } else {
-            $result->emailServiceAccount = empty($httpData->email_service_account) ? $pmGoogle->getServiceAccountEmail() : $httpData->email_service_account;
-            $result->pathServiceAccountP12 = empty($_FILES['file_p12']['tmp_name']) ? PATH_DATA_SITE . $pmGoogle->getserviceAccountP12() : $_FILES['file_p12']['tmp_name'];
-        }
 
         print(G::json_encode($pmGoogle->testService($result)));
     }

workflow/engine/data/mysql/schema.sql

@@ -98,6 +98,8 @@ CREATE TABLE `APP_DOCUMENT`
 	`APP_DOC_STATUS_DATE` DATETIME,
 	`APP_DOC_FIELDNAME` VARCHAR(150),
   `APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
+  `SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL,
+  `SYNC_PERMISSIONS` MEDIUMTEXT,
 	PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
 	KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
@@ -2932,3 +2934,26 @@ CREATE TABLE `NOTIFICATION_DEVICE`
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Definitions Notification device.';
 # This restores the fkey checks, after having unset them earlier
 # SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+#-----------------------------------------------------------------------------
+#-- GMAIL_RELABELING
+#-----------------------------------------------------------------------------
+DROP TABLE IF EXISTS `GMAIL_RELABELING`;
+
+CREATE TABLE `GMAIL_RELABELING` (
+	`LABELING_UID` 				  VARCHAR(32)  NOT NULL,
+	`CREATE_DATE`	  	      DATETIME NOT NULL,
+	`APP_UID` 				      VARCHAR(32) NOT NULL DEFAULT '',
+	`DEL_INDEX` 			      INT(11) 		NOT NULL DEFAULT '0',
+	`CURRENT_LAST_INDEX`    INT(11) 		NOT NULL DEFAULT '0',
+	`UNASSIGNED`            INT(11)   	NOT NULL DEFAULT '0',
+	`STATUS`  							VARCHAR(32) NOT NULL DEFAULT 'pending',
+	`MSG_ERROR`  						TEXT NULL,
+	PRIMARY KEY (`LABELING_UID`),
+	KEY `indexStatus` (`STATUS`)
+)ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Task to synchronize Gmail Labels';
+# This restores the fkey checks, after having unset them earlier
+# SET FOREIGN_KEY_CHECKS = 1;
+

workflow/engine/menus/setup.php

@@ -73,8 +73,8 @@ if ($RBAC->userCanAccess('PM_SETUP') == 1) {
     if ($licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
         $G_TMP_MENU->AddIdRawOption('STRATEGIC_DASHBOARD', '../strategicDashboard/dashboardList', ucfirst(G::LoadTranslation('ID_STRATEGIC_DASHBOARD')), '', '', 'settings');
     }
-    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') || $licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
-        $G_TMP_MENU->AddIdRawOption('PMGMAIL', '../pmGmail/formPMGmail', ucfirst(G::LoadTranslation('ID_PMGMAIL')), '', '', 'settings');
+        $G_TMP_MENU->AddIdRawOption('PMGMAIL', '../pmGmail/formPMGmail', ucfirst(G::LoadTranslation('ID_GOOGLEINTEGRATION')), '', '', 'settings');
     }
 
     /*----------------------------------********---------------------------------*/

workflow/engine/methods/cases/casesListExtJsRedirector.php

@@ -2,12 +2,12 @@
 if (typeof window.parent != 'undefined') {
 <?php
 /*----------------------------------********---------------------------------*/
-$enablePMGmail = false;
+$statusPMGmail = false;
 $licensedFeatures = &PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-    G::LoadClass( "pmDrive" );
+    G::LoadClass( "pmGoogleApi" );
-    $pmDrive = new PMDrive();
+    $pmGoogle = new PMGoogleApi();
-    $enablePMGmail = $pmDrive->getStatusService();
+    $statusPMGmail = $pmGoogle->getServiceGmailStatus();
 }
 /*----------------------------------********---------------------------------*/
 if (isset( $_GET['ux'] )) {
@@ -20,7 +20,7 @@ if (isset( $_GET['ux'] )) {
         default:
             $url = 'casesListExtJs';
     }
-} else if( key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail==1 ){
+} else if( key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $statusPMGmail ){
     $url = 'derivatedGmail';
 } else {
     $url = 'casesListExtJs';
@@ -31,8 +31,8 @@ if (isset( $_GET['ux'] )) {
 echo "  window.parent.location.href = '$url';";
 if (isset( $_GET['ux'] )) {
     /*----------------------------------********---------------------------------*/
-    if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && !empty($enablePMGmail) && $enablePMGmail==1){
+    if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail){
-	echo '} else { window.parent.location.href = \'derivatedGmail\'; }';
+        echo '} else { window.parent.location.href = \'derivatedGmail\'; }';
     } else {
     /*----------------------------------********---------------------------------*/
         echo '} else { window.parent.location.href = \'casesListExtJs\'; }';

workflow/engine/methods/cases/casesStartPage_Ajax.php

@@ -262,19 +262,17 @@ function startCase ()
         $_SESSION['CASES_REFRESH'] = true;
 
         /*----------------------------------********---------------------------------*/
-        //sending the email for gmail integration if the option es available
+        //sending the email for gmail integration if the option is available
-        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+            G::LoadClass( "pmGoogleApi" );
+            $pmGoogle = new PMGoogleApi();
 
-	        $enablePMGmail = false;
+            if($pmGoogle->getServiceGmailStatus()){
-	        G::LoadClass( "pmDrive" );
+                require_once 'src/ProcessMaker/BusinessModel/Pmgmail.php';
-	        $pmDrive = new PMDrive();
+                $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
-	        $enablePMGmail = $pmDrive->getStatusService();
+                $response = $Pmgmail->sendEmail($aData['APPLICATION'], "", $aData['INDEX']);
-	        if(!empty($enablePMGmail) && $enablePMGmail==1){
+            }
-	        	require_once 'src/ProcessMaker/BusinessModel/Pmgmail.php';
-	        	$Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
-	        	$response = $Pmgmail->sendEmail($aData['APPLICATION'], "", $aData['INDEX']);
-	        }
         }
         /*----------------------------------********---------------------------------*/
 

workflow/engine/methods/cases/cases_CatchExecute.php

@@ -67,12 +67,19 @@ $aDelegation = $oAppDelegation->load( $sAppUid, $iDelIndex );
 //if there are no user in the delegation row, this case is still in selfservice
 if ($aDelegation['USR_UID'] == "") {
     $oCase->setCatchUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'] );
+    /*----------------------------------********---------------------------------*/
+    $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();
+            $labGmail->addRelabelingToQueue($sAppUid, $iDelIndex, -1, true);
+        }
+    }
+    /*----------------------------------********---------------------------------*/
     //changing email labels if the claim comes from gmail
     if(array_key_exists('gmail',$_SESSION) && $_SESSION['gmail'] == 1){
-    	require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
-        $labGmail = new labelsGmail();
-        $oResponse = $labGmail->setLabels($sAppUid, $iDelIndex, -1, true);
-
         die( '<script type="text/javascript">
         parent.document.getElementById("iframePM").setAttribute("src", "'.$_SESSION["server"].'cases/cases_Open?APP_UID=' . $_SESSION["APPLICATION"] . '&DEL_INDEX=' . $_SESSION["INDEX"] . '&action=unassigned");
         </script>' );

workflow/engine/methods/cases/cases_Derivate.php

@@ -208,13 +208,28 @@ try {
         }
     }
     //Events - End
+
+    /*----------------------------------********---------------------------------*/
+    // Set users drive - start
+    $licensedFeatures = &PMLicensedFeatures::getSingleton();
+    if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+        G::LoadClass("AppDocumentDrive");
+        $drive = new AppDocumentDrive();
+        if ($drive->getStatusDrive()) {
+            //add users email next task
+            $drive->addUsersDocumentDrive($appFields['APP_UID']);
+        }
+    }
+    // Set users drive - End
+    /*----------------------------------********---------------------------------*/
+
     $debuggerAvailable = true;
 
     if (isset( $_SESSION['user_experience'] )) {
         $aNextStep['PAGE'] = 'casesListExtJsRedirector?ux=' . $_SESSION['user_experience'];
         $debuggerAvailable = false;
     } else if( isset( $_SESSION['gmail'] )  ){
-    	$aNextStep['PAGE'] = 'casesListExtJsRedirector?gmail='.$_SESSION['gmail'];
+        $aNextStep['PAGE'] = 'casesListExtJsRedirector?gmail='.$_SESSION['gmail'];
     } else {
         $aNextStep['PAGE'] = 'casesListExtJsRedirector';
     }

workflow/engine/methods/cases/cases_SaveData.php

@@ -360,91 +360,6 @@ try {
                     $sPathName = PATH_DOCUMENT . $pathUID . PATH_SEP;
                     $sFileName = $sAppDocUid . "_" . $iDocVersion . "." . $sExtension;
 
-                    /*----------------------------------********---------------------------------*/
-                    $licensedFeatures = &PMLicensedFeatures::getSingleton();
-                    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                        G::LoadClass( "pmDrive" );
-                        $pmDrive = new PMDrive();
-                        if ($pmDrive->getStatusService()) {
-                            $app = new Application();
-                            $user = new Users();
-                            $dataUser = $user->load($_SESSION['USER_LOGGED']);
-                            $pmDrive->setDriveUser($dataUser['USR_EMAIL']);
-
-                            $appData = $app->Load($_SESSION['APPLICATION']);
-                            if ($appData['APP_DRIVE_FOLDER_UID'] == null) {
-                                $process = new Process();
-                                $process->setProUid($appData['PRO_UID']);
-
-                                $result = $pmDrive->createFolder($process->getProTitle() . ' - ' . G::LoadTranslation("ID_CASE") . ' #' . $appData['APP_NUMBER'],
-                                    $pmDrive->getFolderIdPMDrive($_SESSION['USER_LOGGED']));
-                                $appData['APP_DRIVE_FOLDER_UID'] = $result->id;
-                                $app->update($appData);
-                            }
-
-                            $result = $pmDrive->uploadFile('application/' . $sExtension, $arrayFileTmpName[$i],
-                                $arrayFileName[$i], $appData['APP_DRIVE_FOLDER_UID']);
-                            $oAppDocument->setDriveDownload('ATTACHED', $result->webContentLink);
-                            $fileIdDrive = $result->id;
-                            $aFields['DOC_VERSION'] = $iDocVersion;
-                            $aFields['APP_DOC_UID'] = $sAppDocUid;
-
-                            $oAppDocument->update($aFields);
-
-                            //add permissions
-                            $criteria = new Criteria('workflow');
-                            $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::TAS_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::USR_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::TU_RELATION);
-
-                            $criteria->add(ApplicationPeer::APP_UID, $_SESSION['APPLICATION']);
-                            $criteria->addJoin(ApplicationPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN);
-                            $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
-
-                            $dataset = TaskUserPeer::doSelectRs($criteria);
-                            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                            $userPermission = array();
-                            $case = new Cases();
-
-                            while ($dataset->next()) {
-                                $row = $dataset->getRow();
-                                if ($row['TU_RELATION'] == 1) {
-                                    //users
-                                    $dataUser = $user->load($row['USR_UID']);
-                                    if (array_search($dataUser['USR_EMAIL'], $userPermission) === false) {
-                                        $userPermission[] = $dataUser['USR_EMAIL'];
-                                    }
-                                } else {
-                                    //Groups
-                                    $criteria = new Criteria('workflow');
-                                    $criteria->addSelectColumn(UsersPeer::USR_EMAIL);
-                                    $criteria->addSelectColumn(UsersPeer::USR_UID);
-                                    $criteria->add(GroupUserPeer::GRP_UID, $row['USR_UID']);
-                                    $criteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
-
-                                    $oDataset = AppDelegationPeer::doSelectRs($criteria);
-                                    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                                    while ($oDataset->next()) {
-                                        $aRow = $oDataset->getRow();
-                                        if (array_search($aRow['USR_EMAIL'], $userPermission) === false) {
-                                            $userPermission[] = $aRow['USR_EMAIL'];
-                                        }
-
-                                    }
-                                }
-
-                            }
-                            $userPermission = array_unique($userPermission);
-
-                            foreach ($userPermission as $key => $value) {
-                                $pmDrive->setPermission($appData['APP_DRIVE_FOLDER_UID'], $value, 'user', 'writer');
-                                $pmDrive->setPermission($fileIdDrive, $value);
-                            }
-                        }
-                    }
-                    /*----------------------------------********---------------------------------*/
-
                     G::uploadFile( $arrayFileTmpName[$i], $sPathName, $sFileName );
 
                     //Plugin Hook PM_UPLOAD_DOCUMENT for upload document

workflow/engine/methods/cases/cases_ShowDocument.php

@@ -107,7 +107,34 @@ if (! $sw_file_exists) {
         $res['message'] = $oAppDocument->Fields['APP_DOC_FILENAME'];
         print G::json_encode( $res );
     } else {
-        G::streamFile( $realPath, $bDownload, $oAppDocument->Fields['APP_DOC_FILENAME'] ); //download
+        $nameFile = $oAppDocument->Fields['APP_DOC_FILENAME'];
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $downloadStatus = false;
+        if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+            G::LoadClass( "AppDocumentDrive" );
+            $drive = new AppDocumentDrive();
+            if ($drive->getStatusDrive()) {
+                $fieldDrive = $oAppDocument->getAppDocDriveDownload();
+                $drive->loadUser($_SESSION['USER_LOGGED']);
+                $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $oAppDocument->getAppDocType());
+                $fileContent = $drive->download($uidDrive);
+                if ($fileContent !== null) {
+                    $downloadStatus = true;
+                    header('Content-Description: File Transfer');
+                    header('Content-Disposition: attachment; filename='.$nameFile);
+                    header('Content-Transfer-Encoding: binary');
+                    header('Set-Cookie: fileLoading=true');
+                    echo $fileContent;
+                    exit();
+                }
+            }
+        }
+        if (!$downloadStatus) {
+            G::streamFile( $realPath, $bDownload, $nameFile ); //download
+        }
+
+
+
     }
 }
 

workflow/engine/methods/cases/cases_ShowOutputDocument.php

@@ -109,7 +109,35 @@ if (! $sw_file_exists) {
         $res['message'] = $info['basename'] . $ver . '.' . $ext;
         print G::json_encode( $res );
     } else {
-        G::streamFile( $realPath, $download, $info['basename'] . $ver . '.' . $ext );
+        $nameFile = $info['basename'] . $ver . '.' . $ext;
+        $licensedFeatures = &PMLicensedFeatures::getSingleton();
+        $downloadStatus = false;
+        if ($licensedFeatures->verifyfeature('AhKNjBEVXZlWUFpWE8wVTREQ0FObmo0aTdhVzhvalFic1M=')) {
+            G::LoadClass( "AppDocumentDrive" );
+            $drive = new AppDocumentDrive();
+            if ($drive->getStatusDrive()) {
+                $fieldDrive = $oAppDocument->getAppDocDriveDownload();
+                $drive->loadUser($_SESSION['USER_LOGGED']);
+                $type = $ext == 'doc' ? 'OUTPUT_DOC' : 'OUTPUT_PDF';
+                $uidDrive = $drive->changeUrlDrive($oAppDocument->Fields, $type);
+                $fileContent = $drive->download($uidDrive);
+                if ($fileContent !== null) {
+                    $downloadStatus = true;
+                    header('Content-Description: File Transfer');
+                    header('Content-Disposition: attachment; filename='.$nameFile);
+                    header('Content-Transfer-Encoding: binary');
+                    header('Set-Cookie: fileLoading=true');
+                    echo $fileContent;
+                    exit();
+                }
+            }
+        }
+        if (!$downloadStatus) {
+            G::streamFile( $realPath, $download, $nameFile); //download
+        }
+
+        //die($realPath);
+        //G::streamFile( $realPath, $download, $info['basename'] . $ver . '.' . $ext );
     }
 }
 //G::streamFile ( $realPath, true);

workflow/engine/methods/cases/cases_Step.php

@@ -628,130 +628,6 @@ try {
                     $oCase->updateCase( $_SESSION['APPLICATION'], $Fields );
                     //Save data - End
 
-                    /*----------------------------------********---------------------------------*/
-                    $licensedFeatures = &PMLicensedFeatures::getSingleton();
-                    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                        G::LoadClass( "pmDrive" );
-                        $pmDrive = new PMDrive();
-                        if ($pmDrive->getStatusService()) {
-                            $app = new Application();
-                            $user = new Users();
-                            $dataUser = $user->load($_SESSION['USER_LOGGED']);
-                            $pmDrive->setDriveUser($dataUser['USR_EMAIL']);
-
-                            $applicationUid = $_SESSION['APPLICATION'];
-                            $appData = $app->Load($applicationUid);
-                            if ($appData['APP_DRIVE_FOLDER_UID'] == null) {
-                                $process = new Process();
-                                $process->setProUid($appData['PRO_UID']);
-
-                                $result = $pmDrive->createFolder($process->getProTitle() . ' - ' . G::LoadTranslation("ID_CASE") . ' #' . $appData['APP_NUMBER'],
-                                    $pmDrive->getFolderIdPMDrive($_SESSION['USER_LOGGED']));
-                                $appData['APP_DRIVE_FOLDER_UID'] = $result->id;
-                                $app->update($appData);
-                            }
-
-                            $fileIdDriveDoc = '';
-                            $fileIdDrivePdf = '';
-                            switch ($aOD['OUT_DOC_GENERATE']) {
-                                case "BOTH":
-                                    $result = $pmDrive->uploadFile('application/pdf', $pathOutput . $sFilename . '.pdf',
-                                        $sFilenameOriginal . '.pdf', $appData['APP_DRIVE_FOLDER_UID']);
-                                    $oAppDocument->setDriveDownload('OUTPUT_PDF', $result->webContentLink);
-                                    $fileIdDrivePdf = $result->id;
-                                    $result = $pmDrive->uploadFile('application/doc', $pathOutput . $sFilename . '.doc',
-                                        $sFilenameOriginal . '.doc', $appData['APP_DRIVE_FOLDER_UID']);
-                                    $oAppDocument->setDriveDownload('OUTPUT_DOC', $result->webContentLink);
-                                    $fileIdDriveDoc = $result->id;
-                                    break;
-                                case "PDF":
-                                    $result = $pmDrive->uploadFile('application/pdf', $pathOutput . $sFilename . '.pdf',
-                                        $sFilenameOriginal . '.pdf', $appData['APP_DRIVE_FOLDER_UID']);
-                                    $oAppDocument->setDriveDownload('OUTPUT_PDF', $result->webContentLink);
-                                    $fileIdDrivePdf = $result->id;
-                                    break;
-                                case "DOC":
-                                    $result = $pmDrive->uploadFile('application/doc', $pathOutput . $sFilename . '.doc',
-                                        $sFilenameOriginal . '.doc', $appData['APP_DRIVE_FOLDER_UID']);
-                                    $oAppDocument->setDriveDownload('OUTPUT_DOC', $result->webContentLink);
-                                    $fileIdDriveDoc = $result->id;
-                                    break;
-                            }
-                            $aFields['DOC_VERSION'] = $oAppDocument->getDocVersion();// $docVersion;
-                            $aFields['APP_DOC_UID'] = $oAppDocument->getAppDocUid();//$appDocUid;
-                            $appDocUid = $aFields['APP_DOC_UID'];
-
-                            $oAppDocument->update($aFields);
-                            //$option = 'pmDrive';
-
-
-                            //add permissions
-                            $criteria = new Criteria('workflow');
-                            $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::TAS_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::USR_UID);
-                            $criteria->addSelectColumn(TaskUserPeer::TU_RELATION);
-
-                            $criteria->add(ApplicationPeer::APP_UID, $applicationUid);
-                            $criteria->addJoin(ApplicationPeer::PRO_UID, TaskPeer::PRO_UID, Criteria::LEFT_JOIN);
-                            $criteria->addJoin(TaskPeer::TAS_UID, TaskUserPeer::TAS_UID, Criteria::LEFT_JOIN);
-
-
-                            $dataset = ApplicationPeer::doSelectRs($criteria);
-                            $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-
-                            $userPermission = array();
-                            $case = new Cases();
-
-                            while ($dataset->next()) {
-                                $row = $dataset->getRow();
-                                if ($row['TU_RELATION'] == 1) {
-                                    //users
-                                    $dataUser = $user->load($row['USR_UID']);
-                                    if (array_search($dataUser['USR_EMAIL'], $userPermission) === false) {
-                                        $objectPermissions = $case->getAllObjects($row['PRO_UID'], $applicationUid,
-                                            $row['TAS_UID'], $row['USR_UID']);
-                                        if (array_search($appDocUid, $objectPermissions['OUTPUT_DOCUMENTS']) !== false) {
-                                            $userPermission[] = $dataUser['USR_EMAIL'];
-                                        }
-                                    }
-                                } else {
-                                    //Groups
-                                    $criteria = new Criteria('workflow');
-                                    $criteria->addSelectColumn(UsersPeer::USR_EMAIL);
-                                    $criteria->addSelectColumn(UsersPeer::USR_UID);
-                                    $criteria->add(GroupUserPeer::GRP_UID, $row['USR_UID']);
-                                    $criteria->addJoin(GroupUserPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
-
-                                    $oDataset = AppDelegationPeer::doSelectRs($criteria);
-                                    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-                                    while ($oDataset->next()) {
-                                        $aRow = $oDataset->getRow();
-                                        if (array_search($aRow['USR_EMAIL'], $userPermission) === false) {
-                                            $objectPermissions = $case->getAllObjects($row['PRO_UID'], $applicationUid,
-                                                $row['TAS_UID'], $aRow['USR_UID']);
-                                            if (array_search($appDocUid,
-                                                    $objectPermissions['OUTPUT_DOCUMENTS']) !== false
-                                            ) {
-                                                $userPermission[] = $aRow['USR_EMAIL'];
-                                            }
-                                        }
-
-                                    }
-                                }
-
-                            }
-                            $userPermission = array_unique($userPermission);
-
-                            foreach ($userPermission as $key => $val) {
-                                $pmDrive->setPermission($appData['APP_DRIVE_FOLDER_UID'], $val, 'user', 'writer');
-                                $pmDrive->setPermission($fileIdDrivePdf, $val);
-                                $pmDrive->setPermission($fileIdDriveDoc, $val);
-                            }
-                        }
-                    }
-                    /*----------------------------------********---------------------------------*/
-
                     //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
                     $oPluginRegistry = & PMPluginRegistry::getSingleton();
                     if ($oPluginRegistry->existsTrigger( PM_UPLOAD_DOCUMENT ) && class_exists( 'uploadDocumentData' )) {
@@ -867,29 +743,6 @@ try {
                         }
                     }
 
-                    /*----------------------------------********---------------------------------*/
-                    $licensedFeatures = &PMLicensedFeatures::getSingleton();
-                    $enablePMGmail = false;
-                    if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                        G::LoadClass( "pmDrive" );
-                        $pmDrive = new PMDrive();
-                        if ($pmDrive->getStatusService()) {
-                            //change donwload link - drive
-                            $driveDownload = @unserialize($aFields['APP_DOC_DRIVE_DOWNLOAD']);
-                            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_DOC',
-                                    $driveDownload)
-                            ) {
-                                $aFields['FILE1'] = $driveDownload['OUTPUT_DOC'];
-                            }
-                            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_PDF',
-                                    $driveDownload)
-                            ) {
-                                $aFields['FILE2'] = $driveDownload['OUTPUT_PDF'];
-                            }
-                        }
-                    }
-                    /*----------------------------------********---------------------------------*/
-
                     if (($aGields['OUT_DOC_GENERATE'] == 'BOTH') || ($aGields['OUT_DOC_GENERATE'] == '')) {
                         $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_ViewOutputDocument1', '', G::array_merges( $aOD, $aFields ), '' );
                     }

workflow/engine/methods/cases/derivatedGmail.php

@@ -32,16 +32,14 @@ foreach ($appDelPrev as $app){
 
 require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
 $oLabels = new labelsGmail();
-$oResponse = $oLabels->setLabels($caseId, $actualIndex, $actualLastIndex, false);
+$oLabels->addRelabelingToQueue($caseId, $actualIndex, $actualLastIndex, false);
 
-$enablePMGmail = false;
+G::LoadClass( "pmGoogleApi" );
-G::LoadClass( "pmDrive" );
+$pmGoogle = new PMGoogleApi();
-$pmDrive = new PMDrive();
+if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle->getServiceGmailStatus() ){
-$enablePMGmail = $pmDrive->getStatusService();
-if(key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail==1 ){
 	$_SESSION['gmail'] = 0;
 	unset($_SESSION['gmail']); //cleaning session
-	$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/neoclassic/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
+	$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
 } else{
 	$mUrl = 'casesListExtJs';
 }

workflow/engine/methods/cases/open.php

@@ -61,18 +61,17 @@ $oHeadPublisher = & headPublisher::getSingleton();
 
 $urlToRedirectAfterPause = 'casesListExtJs';
 
-        /*----------------------------------********---------------------------------*/
+/*----------------------------------********---------------------------------*/
 $licensedFeatures = &PMLicensedFeatures::getSingleton();
 if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-    G::LoadClass( "pmDrive" );
+    G::LoadClass( "pmGoogleApi" );
-    $pmDrive = new PMDrive();
+    $pmGoogle = new PMGoogleApi();
-    $enablePMGmail = $pmDrive->getStatusService();
+    if (array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle->getServiceGmailStatus()) {
-    if (key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail == 1) {
         $_SESSION['gmail'] = 0;
         $urlToRedirectAfterPause = '/sys'. $_SESSION['WORKSPACE'] .'/en/neoclassic/cases/cases_Open?APP_UID='.$_SESSION['APPLICATION'].'&DEL_INDEX='.$_SESSION['INDEX'].'&action=sent';
     }
 }
-        /*----------------------------------********---------------------------------*/
+/*----------------------------------********---------------------------------*/
 
 
 $oHeadPublisher->assign( 'urlToRedirectAfterPause', $urlToRedirectAfterPause );

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

@@ -1179,15 +1179,6 @@ class Cases
             //$oPluginRegistry      = & PMPluginRegistry::getSingleton();
             $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
         }
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &\PMLicensedFeatures::getSingleton();
-        $enablePMGmail = false;
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new \PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-        }
-        /*----------------------------------********---------------------------------*/
         $aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
         if (!is_array($aObjectPermissions)) {
             $aObjectPermissions = array(
@@ -1307,15 +1298,6 @@ class Cases
                     }
                 }
             }
-            /*----------------------------------********---------------------------------*/
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -1387,15 +1369,7 @@ class Cases
             }
             $aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_DOWNLOAD');
             $aFields['DOWNLOAD_LINK'] = "cases/cases_ShowDocument?a=" . $aRow['APP_DOC_UID'];
-            /*----------------------------------********---------------------------------*/
+
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('ATTACHED',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['ATTACHED'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -1459,15 +1433,7 @@ class Cases
                     }
                 }
             }
-            /*----------------------------------********---------------------------------*/
+
-            //change donwload link - drive
-            $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-            if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('INPUT',
-                    $driveDownload) && $enablePMGmail
-            ) {
-                $aFields['DOWNLOAD_LINK'] = $driveDownload['INPUT'];
-            }
-            /*----------------------------------********---------------------------------*/
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;
@@ -1511,15 +1477,6 @@ class Cases
             //$oPluginRegistry = & PMPluginRegistry::getSingleton();
             $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
         }
-        /*----------------------------------********---------------------------------*/
-        $licensedFeatures = &\PMLicensedFeatures::getSingleton();
-        $enablePMGmail = false;
-        if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            G::LoadClass( "pmDrive" );
-            $pmDrive = new \PMDrive();
-            $enablePMGmail = $pmDrive->getStatusService();
-        }
-        /*----------------------------------********---------------------------------*/
         $aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
         if (!is_array($aObjectPermissions)) {
             $aObjectPermissions = array('DYNAFORMS' => array(-1),'INPUT_DOCUMENTS' => array(-1),'OUTPUT_DOCUMENTS' => array(-1));
@@ -1665,20 +1622,6 @@ class Cases
                 } catch (\Exception $oException) {
                     $sUser = '(USER DELETED)';
                 }
-                /*----------------------------------********---------------------------------*/
-                //change donwload link - drive
-                $driveDownload = @unserialize($aRow['APP_DOC_DRIVE_DOWNLOAD']);
-                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_DOC',
-                        $driveDownload) && $enablePMGmail
-                ) {
-                    $fileDoc = $driveDownload['OUTPUT_DOC'];
-                }
-                if ($driveDownload !== false && is_array($driveDownload) && array_key_exists('OUTPUT_PDF',
-                        $driveDownload) && $enablePMGmail
-                ) {
-                    $filePdf = $driveDownload['OUTPUT_PDF'];
-                }
-                /*----------------------------------********---------------------------------*/
                 //if both documents were generated, we choose the pdf one, only if doc was
                 //generate then choose the doc file.
                 $firstDocLink = $filePdf;

workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php

@@ -307,16 +307,6 @@ class InputDocument
             $rsCriteria = \AppDocumentPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
 
-            /*----------------------------------********---------------------------------*/
-            $licensedFeatures = &\PMLicensedFeatures::getSingleton();
-            $enablePMGmail = false;
-            if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                \G::LoadClass( "pmDrive" );
-                $pmDrive = new \PMDrive();
-                $enablePMGmail = $pmDrive->getStatusService();
-            }
-            /*----------------------------------********---------------------------------*/
-
             while ($rsCriteria->next()) {
                 $row = $rsCriteria->getRow();
 
@@ -327,19 +317,6 @@ class InputDocument
                 $row["APP_DOC_FILENAME"] = $arrayAppDocument["APP_DOC_FILENAME"];
                 $row["APP_DOC_CREATE_USER"] = $configuraction->usersNameFormatBySetParameters($confEnvSetting["format"], $arrayUserData["USR_USERNAME"], $arrayUserData["USR_FIRSTNAME"], $arrayUserData["USR_LASTNAME"]);
                 $row["APP_DOC_LINK"] = "cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
-                /*----------------------------------********---------------------------------*/
-                //change donwload link - drive
-                $driveDownload = @unserialize($arrayAppDocument['APP_DOC_DRIVE_DOWNLOAD']);
-                if ($driveDownload !== false && is_array($driveDownload) && $enablePMGmail
-                ) {
-                    if (array_key_exists('INPUT', $driveDownload)) {
-                        $row['APP_DOC_LINK'] = $driveDownload['INPUT'];
-                    } else if (array_key_exists('ATTACHED', $driveDownload)) {
-                        $row['APP_DOC_LINK'] = $driveDownload['ATTACHED'];
-                    }
-
-                }
-                /*----------------------------------********---------------------------------*/
 
                 $arrayInputDocument[] = $this->getAppDocumentDataFromRecord($row);
             }
@@ -394,15 +371,6 @@ class InputDocument
             $rsCriteria = \AppDocumentPeer::doSelectRS($criteria);
             $rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
 
-            /*----------------------------------********---------------------------------*/
-            $licensedFeatures = &\PMLicensedFeatures::getSingleton();
-            $enablePMGmail = false;
-            if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                \G::LoadClass( "pmDrive" );
-                $pmDrive = new \PMDrive();
-                $enablePMGmail = $pmDrive->getStatusService();
-            }
-            /*----------------------------------********---------------------------------*/
             while ($rsCriteria->next()) {
                 $row = $rsCriteria->getRow();
 
@@ -417,19 +385,6 @@ class InputDocument
                 $row["APP_DOC_FILENAME"] = $arrayAppDocument["APP_DOC_FILENAME"];
                 $row["APP_DOC_CREATE_USER"] = $sUser;
                 $row["APP_DOC_LINK"] = "cases/cases_ShowDocument?a=" . $row["APP_DOC_UID"] . "&v=" . $row["DOC_VERSION"];
-                /*----------------------------------********---------------------------------*/
-                //change donwload link - drive
-                $driveDownload = @unserialize($arrayAppDocument['APP_DOC_DRIVE_DOWNLOAD']);
-                if ($driveDownload !== false && is_array($driveDownload) && $enablePMGmail
-                ) {
-                    if (array_key_exists('INPUT', $driveDownload)) {
-                        $row['APP_DOC_LINK'] = $driveDownload['INPUT'];
-                    } else if (array_key_exists('ATTACHED', $driveDownload)) {
-                        $row['APP_DOC_LINK'] = $driveDownload['ATTACHED'];
-                    }
-
-                }
-                /*----------------------------------********---------------------------------*/
 
                 $arrayInputDocument[] = $this->getAppDocumentDataFromRecord($row);
             }

workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php

@@ -404,128 +404,6 @@ class OutputDocument
             }
             $this->generate( $outputID, $Fields['APP_DATA'], $pathOutput, $sFilename, $aOD['OUT_DOC_TEMPLATE'], (boolean) $aOD['OUT_DOC_LANDSCAPE'], $aOD['OUT_DOC_GENERATE'], $aProperties , $applicationUid);
 
-            /*----------------------------------********---------------------------------*/
-            $licensedFeatures = &\PMLicensedFeatures::getSingleton();
-            if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-                \G::LoadClass( "pmDrive" );
-                $pmDrive = new \PMDrive();
-                if ($pmDrive->getStatusService()) {
-                    $app = new \Application();
-                    $user = new \Users();
-                    $dataUser = $user->load($userUid);
-                    $pmDrive->setDriveUser($dataUser['USR_EMAIL']);
-
-                    $appData = $app->Load($applicationUid);
-                    if ($appData['APP_DRIVE_FOLDER_UID'] == null) {
-                        $process = new \Process();
-                        $process->setProUid($appData['PRO_UID']);
-
-                        $result = $pmDrive->createFolder($process->getProTitle() . ' - ' . G::LoadTranslation("ID_CASE") . ' #' . $appData['APP_NUMBER'],
-                            $pmDrive->getFolderIdPMDrive($userUid));
-                        $appData['APP_DRIVE_FOLDER_UID'] = $result->id;
-                        $app->update($appData);
-                    }
-
-                    $fileIdDriveDoc = '';
-                    $fileIdDrivePdf = '';
-                    $sFilenameOriginal = preg_replace('[^A-Za-z0-9_]', '_',
-                        \G::replaceDataField($aOD['OUT_DOC_FILENAME'], $Fields['APP_DATA']));
-                    switch ($aOD['OUT_DOC_GENERATE']) {
-                        case "BOTH":
-                            $result = $pmDrive->uploadFile('application/pdf', $pathOutput . $sFilename . '.pdf',
-                                $sFilenameOriginal . '.pdf', $appData['APP_DRIVE_FOLDER_UID']);
-                            $oAppDocument->setDriveDownload('OUTPUT_PDF', $result->webContentLink);
-                            $fileIdDrivePdf = $result->id;
-                            $result = $pmDrive->uploadFile('application/doc', $pathOutput . $sFilename . '.doc',
-                                $sFilenameOriginal . '.doc', $appData['APP_DRIVE_FOLDER_UID']);
-                            $oAppDocument->setDriveDownload('OUTPUT_DOC', $result->webContentLink);
-                            $fileIdDriveDoc = $result->id;
-                            break;
-                        case "PDF":
-                            $result = $pmDrive->uploadFile('application/pdf', $pathOutput . $sFilename . '.pdf',
-                                $sFilenameOriginal . '.pdf', $appData['APP_DRIVE_FOLDER_UID']);
-                            $oAppDocument->setDriveDownload('OUTPUT_PDF', $result->webContentLink);
-                            $fileIdDrivePdf = $result->id;
-                            break;
-                        case "DOC":
-                            $result = $pmDrive->uploadFile('application/doc', $pathOutput . $sFilename . '.doc',
-                                $sFilenameOriginal . '.doc', $appData['APP_DRIVE_FOLDER_UID']);
-                            $oAppDocument->setDriveDownload('OUTPUT_DOC', $result->webContentLink);
-                            $fileIdDriveDoc = $result->id;
-                            break;
-                    }
-                    $aFields['DOC_VERSION'] = $oAppDocument->getDocVersion();// $docVersion;
-                    $aFields['APP_DOC_UID'] = $oAppDocument->getAppDocUid();//$appDocUid;
-                    $appDocUid = $aFields['APP_DOC_UID'];
-
-                    $oAppDocument->update($aFields);
-                    //$option = 'pmDrive';
-
-
-                    //add permissions
-                    $criteria = new \Criteria('workflow');
-                    $criteria->addSelectColumn(\ApplicationPeer::PRO_UID);
-                    $criteria->addSelectColumn(\TaskUserPeer::TAS_UID);
-                    $criteria->addSelectColumn(\TaskUserPeer::USR_UID);
-                    $criteria->addSelectColumn(\TaskUserPeer::TU_RELATION);
-
-                    $criteria->add(\ApplicationPeer::APP_UID, $applicationUid);
-                    $criteria->addJoin(\ApplicationPeer::PRO_UID, \TaskPeer::PRO_UID, \Criteria::LEFT_JOIN);
-                    $criteria->addJoin(\TaskPeer::TAS_UID, \TaskUserPeer::TAS_UID, \Criteria::LEFT_JOIN);
-
-
-                    $dataset = \ApplicationPeer::doSelectRS($criteria);
-                    $dataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
-
-                    $userPermission = array();
-                    $case = new \Cases();
-
-                    while ($dataset->next()) {
-                        $row = $dataset->getRow();
-                        if ($row['TU_RELATION'] == 1) {
-                            //users
-                            $dataUser = $user->load($row['USR_UID']);
-                            if (array_search($dataUser['USR_EMAIL'], $userPermission) === false) {
-                                $objectPermissions = $case->getAllObjects($row['PRO_UID'], $applicationUid,
-                                    $row['TAS_UID'], $row['USR_UID']);
-                                if (array_search($appDocUid, $objectPermissions['OUTPUT_DOCUMENTS']) !== false) {
-                                    $userPermission[] = $dataUser['USR_EMAIL'];
-                                }
-                            }
-                        } else {
-                            //Groups
-                            $criteria = new \Criteria('workflow');
-                            $criteria->addSelectColumn(\UsersPeer::USR_EMAIL);
-                            $criteria->addSelectColumn(\UsersPeer::USR_UID);
-                            $criteria->add(\GroupUserPeer::GRP_UID, $row['USR_UID']);
-                            $criteria->addJoin(\GroupUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN);
-
-                            $oDataset = \AppDelegationPeer::doSelectRS($criteria);
-                            $oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
-
-                            while ( $oDataset->next()) {
-                                $aRow = $oDataset->getRow();
-                                if (array_search($aRow['USR_EMAIL'], $userPermission) === false) {
-                                    $objectPermissions = $case->getAllObjects($row['PRO_UID'], $applicationUid,
-                                        $row['TAS_UID'], $aRow['USR_UID']);
-                                    if (array_search($appDocUid, $objectPermissions['OUTPUT_DOCUMENTS']) !== false) {
-                                        $userPermission[] = $aRow['USR_EMAIL'];
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    $userPermission = array_unique($userPermission);
-
-                    foreach ($userPermission as $key => $val) {
-                        $pmDrive->setPermission($appData['APP_DRIVE_FOLDER_UID'], $val, 'user', 'writer');
-                        $pmDrive->setPermission($fileIdDrivePdf, $val);
-                        $pmDrive->setPermission($fileIdDriveDoc, $val);
-                    }
-                }
-            }
-            /*----------------------------------********---------------------------------*/
-
             //Plugin Hook PM_UPLOAD_DOCUMENT for upload document
             //G::LoadClass('plugin');
             $oPluginRegistry = & \PMPluginRegistry::getSingleton();

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

@@ -188,11 +188,14 @@ class Pmgmail {
 
             $subject = "[PM] " .$proName. " (" . $index . ") Case: ". $appNumber;
 
+            //getting the default email server
+            $defaultEmail = $this->emailAccount();
+
             require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.wsBase.php");
             $ws = new \wsBase();
             $resultMail = $ws->sendMessage(
                 $app_uid,
-                'inbox.pm@processmaker.com', //From,
+                $defaultEmail, //From,
                 $mail,//To,
                 '',
                 '',

workflow/engine/src/ProcessMaker/Services/Google/Authentication.php

@@ -23,7 +23,8 @@ class Authentication
         // define options
         $optArray = array(
             CURLOPT_URL => $url,
-            CURLOPT_RETURNTRANSFER => true
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => false
         );
         // apply those options
         curl_setopt_array($ch, $optArray);
@@ -33,7 +34,7 @@ class Authentication
         // Check if any error occurred
         if(curl_errno($ch))
         {
-            throw (new \Exception(\G::LoadTranslation( 'ID_TO_URL' )));
+            throw (new \Exception(curl_error($ch)));
         }
         $info = curl_getinfo($ch);
         curl_close($ch);

workflow/engine/templates/admin/pmGmail.js

@@ -2,13 +2,13 @@ var saveButton;
 var testButton;
 var storeUsers;
 var disableAll;
-var changeType;
+var enableInterfazCertificate;
-Ext.onReady(function(){
+Ext.onReady(function() {
     Ext.QuickTips.init();
 
     testButton = new Ext.Action({
         text : _('ID_TEST_CONNECTION'),
-        disabled : !enablePMGmail,
+        disabled : true,
         handler : testSettings
     });
 
@@ -19,90 +19,62 @@ Ext.onReady(function(){
     });
 
     disableAll = function () {
-        Ext.getCmp('typeAuthentication').disable();
+        Ext.getCmp('emailServiceAccount').disable();
-        Ext.getCmp('email_service_account').disable();
+        Ext.getCmp('googleCertificate').disable();
-        Ext.getCmp('file_p12').disable();
+        Ext.getCmp('labelFileGoogleCertificate').disable();
-        Ext.getCmp('labelFileP12').disable();
-        Ext.getCmp('file_json').disable();
-        Ext.getCmp('fileJson').disable();
         testButton.disable();
         saveButton.disable();
 
-        Ext.getCmp('typeAuthentication').hide();
+        Ext.getCmp('emailServiceAccount').hide();
-        Ext.getCmp('email_service_account').hide();
+        Ext.getCmp('googleCertificate').hide();
-        Ext.getCmp('file_p12').hide();
+        Ext.getCmp('labelFileGoogleCertificate').hide();
-        Ext.getCmp('labelFileP12').hide();
-
-        Ext.getCmp('file_json').hide();
-        Ext.getCmp('fileJson').hide();
 
         Ext.getCmp('listUsers').hide();
         Ext.getCmp('testPMGmail').hide();
     };
 
-    var enableTypeP12 = function () {
+    enableInterfazCertificate = function () {
-        Ext.getCmp('typeAuthentication').enable();
+        Ext.getCmp('emailServiceAccount').enable();
-        Ext.getCmp('email_service_account').enable();
+        Ext.getCmp('googleCertificate').enable();
-        Ext.getCmp('file_p12').enable();
+        Ext.getCmp('labelFileGoogleCertificate').enable();
-        Ext.getCmp('labelFileP12').enable();
 
-        Ext.getCmp('typeAuthentication').show();
+        Ext.getCmp('emailServiceAccount').show();
-        Ext.getCmp('email_service_account').show();
+        Ext.getCmp('googleCertificate').show();
-        Ext.getCmp('file_p12').show();
+        Ext.getCmp('labelFileGoogleCertificate').show();
-        Ext.getCmp('labelFileP12').show();
 
         testButton.enable();
     };
 
-    var enableTypeJson = function () {
-        Ext.getCmp('typeAuthentication').enable();
-        Ext.getCmp('file_json').enable();
-        Ext.getCmp('fileJson').enable();
-
-        Ext.getCmp('typeAuthentication').show();
-        Ext.getCmp('file_json').show();
-        Ext.getCmp('fileJson').show();
-        testButton.enable();
-    };
-
-    changeType = function () {
-        var type = Ext.getCmp('typeAuthentication').getValue();
-        if (type == 'webApplication') {
-            enableTypeJson();
-        } else {
-            enableTypeP12();
-        }
-    };
-
     var configurationPMGmail = new Ext.form.FieldSet({
         title: _('ID_PMGMAIL_SETTINGS'),
         items: [
             {
                 xtype: 'checkbox',
-                id: 'status_pmgmail',
+                id: 'serviceGmailStatus',
-                name: 'status_pmgmail',
+                name: 'serviceGmailStatus',
                 boxLabel: _('ID_ENABLE_PMGMAIL'),
                 value: 0,
                 inputValue: 1,
                 uncheckedValue: 0,
+                disabled: disableGmail,
                 listeners   : {
                     check : function(that, checked) {
                         disableAll();
                         if (checked) {
-                            Ext.getCmp('typeAuthentication').enable();
+                            enableInterfazCertificate();
-                            Ext.getCmp('typeAuthentication').show();
-                            Ext.getCmp('typeAuthentication').clearValue();
                         } else {
                             Ext.MessageBox.confirm(
                                 _('ID_CONFIRM'),
                                 _('ID_PMGMAIL_DISABLE'),
                                 function (btn, text) {
                                     if (btn == "yes") {
-                                        saveSettings();
+                                        if (Ext.getCmp('serviceDriveStatus').getValue()) {
+                                            enableInterfazCertificate();
+                                        }
+                                        saveButton.enable();
                                     } else {
-                                        changeType();
+                                        enableInterfazCertificate();
-                                        Ext.getCmp('status_pmgmail').setValue(1);
+                                        Ext.getCmp('serviceGmailStatus').setValue(1);
-                                        return false;
                                     }
                                 }
                             );
@@ -111,48 +83,61 @@ Ext.onReady(function(){
                 }
             },
             {
-                xtype   : 'combo',
+                xtype       : 'label',
-                id      : 'typeAuthentication',
+                labelAlign  : 'right',
-                name    : 'typeAuthentication',
+                fieldLabel  : '',
-                xtype   : 'combo',
+                text        : _('ID_GMAIL_HELP_ENABLE'),
-                fieldLabel  : _('GMAIL_TYPE_AUTH'),
+                style       : "padding-left:180px; display: inline-block;"
-                hiddenName: 'typeAuth',
+            },
-                mode          : 'local',
+            {
-                triggerAction : 'all',
+                xtype: 'checkbox',
-                forceSelection: true,
+                id: 'serviceDriveStatus',
-                store: new Ext.data.SimpleStore({
+                name: 'serviceDriveStatus',
-                    fields: ['value','type'],
+                boxLabel: _('ID_ENABLE_PMDRIVE'),
-                    data: [['webApplication','Web Application'],['serviceAccount', 'Service Account']],
+                value: 0,
-                    autoLoad: true
+                inputValue: 1,
-                }),
+                uncheckedValue: 0,
-                submitValue : true,
+                disabled: disableDrive,
-                value: typeAuthentication,
+                listeners   : {
-                valueField: 'value',
+                    check : function(that, checked) {
-                displayField: 'type',
-                width: 250,
-                editable: false,
-                listeners:{
-                    afterRender: function () {
                         disableAll();
-                        if (Ext.getCmp('status_pmgmail').checked) {
+                        if (checked) {
-                            changeType();
+                            enableInterfazCertificate();
+                        } else {
+                            Ext.MessageBox.confirm(
+                                _('ID_CONFIRM'),
+                                _('ID_PMDRIVE_DISABLE'),
+                                function (btn, text) {
+                                    if (btn == "yes") {
+                                        if (Ext.getCmp('serviceGmailStatus').getValue()) {
+                                            enableInterfazCertificate();
+                                        }
+                                        saveButton.enable();
+                                    } else {
+                                        enableInterfazCertificate();
+                                        Ext.getCmp('serviceDriveStatus').setValue(1);
+                                    }
+                                }
+                            );
                         }
-                    },
-                    select: function(combo){
-                        disableAll();
-                        changeType();
                     }
                 }
             },
+            {
+                xtype       : 'label',
+                labelAlign  : 'right',
+                fieldLabel  : '',
+                text        : _('ID_DRIVE_HELP_ENABLE'),
+                style       : "padding-left:180px; display: inline-block;"
+            },
             {
                 xtype       : 'textfield',
-                id          : 'email_service_account',
+                id          : 'emailServiceAccount',
-                name        : 'email_service_account',
+                name        : 'emailServiceAccount',
                 fieldLabel  : _('ID_PMG_EMAIL'),
                 width       : 400,
                 allowBlank  : false,
                 value       : accountEmail,
-                disabled    : !enablePMGmail,
                 listeners   : {
                     change: function(){
                         changeSettings();
@@ -168,49 +153,12 @@ Ext.onReady(function(){
             },
             {
                 xtype       : 'fileuploadfield',
-                id          : 'file_p12',
+                id          : 'googleCertificate',
                 emptyText   : _('ID_PMG_SELECT_FILE'),
                 fieldLabel  : _('ID_PMG_FILE'),
-                name        : 'file_p12',
+                name        : 'googleCertificate',
                 buttonText  : '',
                 width       : 400,
-                disabled    : !enablePMGmail,
-                buttonCfg   : {
-                    iconCls : 'upload-icon'
-                },
-                listeners:{
-                    change  : function(){
-                        changeSettings();
-                    },
-                    afterrender:function(cmp){
-                        changeSettings();
-                        cmp.fileInput.set({
-                            accept:'*/p12'
-                        });
-                    }
-                },
-                regex       : /(.)+((\.p12)(\w)?)$/i,
-                regexText   : _('ID_PMG_TYPE_ACCEPT')
-            },
-            {
-                xtype       : 'label',
-                id          : 'labelFileP12',
-                name        : 'labelFileP12',
-                labelAlign  : 'right',
-                fieldLabel  : '',
-                text        : fileP12,
-                width       : 400,
-                style       : "padding-left:180px;"
-            },
-            {
-                xtype       : 'fileuploadfield',
-                id          : 'file_json',
-                emptyText   : _('ID_PMG_SELECT_FILE_JSON'),
-                fieldLabel  : _('ID_PMG_FILE_JSON'),
-                name        : 'file_json',
-                buttonText  : '',
-                width       : 400,
-                disabled    : !enablePMGmail,
                 buttonCfg   : {
                     iconCls : 'upload-icon'
                 },
@@ -230,11 +178,11 @@ Ext.onReady(function(){
             },
             {
                 xtype       : 'label',
-                id          : 'fileJson',
+                id          : 'labelFileGoogleCertificate',
-                name        : 'fileJson',
+                name        : 'labelFileGoogleCertificate',
                 labelAlign  : 'right',
                 fieldLabel  : '',
-                text        : fileJson,
+                text        : googleCertificate,
                 width       : 400,
                 style       : "padding-left:180px;"
             }
@@ -361,11 +309,14 @@ Ext.onReady(function(){
         ]
     });
 
-    Ext.getCmp('status_pmgmail').checked = enablePMGmail;
+    Ext.getCmp('serviceGmailStatus').checked = statusGmail;
-    Ext.getCmp('status_pmgmail').setValue(enablePMGmail);
+    Ext.getCmp('serviceGmailStatus').setValue(statusGmail);
-    if (enablePMGmail){
+    Ext.getCmp('serviceDriveStatus').checked = statusDrive;
-        changeType();
+    Ext.getCmp('serviceDriveStatus').setValue(statusDrive);
+    if (statusGmail || statusDrive){
+        enableInterfazCertificate();
     }
+
 });
 
 var testSettings = function ()
@@ -432,7 +383,7 @@ var saveSettings = function ()
 var changeSettings = function()
 {
     disableAll();
-    if (Ext.getCmp('status_pmgmail').checked) {
+    if (Ext.getCmp('serviceGmailStatus').checked || Ext.getCmp('serviceDriveStatus').checked) {
-        changeType();
+        enableInterfazCertificate();
     }
 };

workflow/engine/templates/cases/open.js

@@ -157,6 +157,14 @@ Ext.onReady(function(){
               tb.add(menu);
           }
         }
+        
+        var olink = document.location.href;
+        if(olink.search("gmail") != -1){
+      	  Ext.getCmp('stepsMenu').hide();
+      	  Ext.getCmp('informationMenu').hide();
+      	  Ext.getCmp('actionMenu').hide();
+      	  Ext.getCmp('caseNotes').hide();
+        }
 
         if (Ext.getCmp('stepsMenu').disabled === true) {
           Ext.getCmp('stepsMenu').hide();

workflow/public_html/pmGmail/sso.php

@@ -1,4 +1,5 @@
 <?php
+session_start();
 require_once (dirname(__FILE__) . '/../../../gulliver/system/class.bootstrap.php');
 
 $gmailToken = $_GET['gmailToken'];

workflow/public_html/pmGmail/uninstall.php

@@ -17,12 +17,10 @@
         <meta name="DC.title" content="ProcessMaker Inc.">
         <meta name="subject" content="Open Source Workflow, Business Process Management (BPM) Soft-ware.">
         <meta name="author" content="ProcessMaker Inc.">
-        <meta name="copyright" content="ProcessMaker Inc.">        <link type="text/css" rel="stylesheet" href="index_files/css_xE-rWrJf-fncB6ztZfd2huxqgxu4WO-qwma6Xer30m4.css" media="all">
+        <meta name="copyright" content="ProcessMaker Inc.">
         <link type="text/css" rel="stylesheet" href="../css/general.css" media="all">
         <link type="text/css" rel="stylesheet" href="../css/sb-admin-2.css" media="all">
         <link rel="shortcut icon" href="http://www.processmaker.com/favicon.ico" type="image/vnd.microsoft.icon">
-        <link rel="alternate" type="application/rss+xml" title="ProcessMaker RSS" href="http://www.processmaker.com/rss.xml">
-        <script src="index_files/jsbox.js" class="lazyload" charset="utf-8"></script><script src="index_files/jsglobal.js" class="lazyload" charset="utf-8"></script><script src="index_files/jstrack.js" class="lazyload" charset="utf-8"></script><link type="text/css" rel="stylesheet" href="index_files/style_002.css" class="lazyload" charset="utf-8"><style type="text/css">.lz_chat_mail { color: #000000 !important; }.lz_chat_link { color: #000000 !important; }.lz_chat_file { color: #000000 !important; }.lz_chat_human { color: #000000 !important; }</style><link type="text/css" rel="stylesheet" href="index_files/style.css" class="lazyload" charset="utf-8"><script src="index_files/jsextern.js" class="lazyload" charset="utf-8"></script><style type="text/css">.fancybox-margin{margin-right:16px;}</style></head>
         <script>
             document.onreadystatechange = function () {
               var state = document.readyState
@@ -36,12 +34,12 @@
             }
     </script>
     <body class="html front not-logged-in no-sidebars page-node" id="page-top" data-spy="scroll" data-target=".navbar-custom" style="background-color:white;">
-    <div id="main-content" class="container" style="display:none;">
+    <div id="main-content" class="container">
         <div class="row">
             <div class="col-lg-12" style="margin: 0 auto;">
                 <div style="margin: 0 auto; width:600px;padding:25px;">
                         <div style="margin: 0 auto; text-align:center;margin-top:40px;">
-                            <img src = "../images/logo-processmake-google.png">
+                            <img src = "../images/logo-processmaker-google.png">
                         </div>
                         <h2 style="margin: 0 auto; text-align:center; margin-top:40px;">ProcessMaker Google Integration</h2>
                         <p style="margin: 0 auto; text-align:center; margin-top:10px;">