diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php
index 39ccef9ba..14682a4ab 100755
--- a/workflow/engine/bin/cron_single.php
+++ b/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,55 @@ 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;
+ }
+
+ G::LoadClass('AppDocumentDrive');
+ $drive = new AppDocumentDrive();
+ if($drive->getStatusDrive()) {
+ setExecutionMessage("Synchronize documents to drive");
+ $drive->synchronizeDrive(true);
+ } else {
+ setExecutionMessage("It has not enabled Feature Gmail");
+ }
+
+ 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;
+ }
+
+ setExecutionMessage("Synchronize labels in Gmail");
+ G::LoadClass('labelsGmail');
+ $labGmail = new labelsGmail();
+ $labGmail->processPendingRelabelingInQueue();
+ setExecutionResultMessage("DONE");
+
+ } catch (Exception $e) {
+ setExecutionResultMessage("WITH ERRORS", "error");
+ eprintln(" '-" . $e->getMessage(), "red");
+ saveLog("synchronizeGmailLabels", "error", "Error when synchronizing Gmail labels: " . $e->getMessage());
+ }
+}
+/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php
index 97206b169..ec7a87211 100644
--- a/workflow/engine/bin/reindex_solr.php
+++ b/workflow/engine/bin/reindex_solr.php
@@ -28,9 +28,11 @@
//(count ($argv) == 4) || ((count ($argv) == 5) && ($argv [3] != '-skip'))
$commandLineSyntaxMsg = "Invalid command line arguments: \n " .
"syntax: ".
- "php reindex_solr.php [workspace_name] [reindexall|reindexmissing|optimizeindex|reindexone] [-skip {record_number}] [-reindextrunksize {trunk_size}] [-appuid {APP_UID}]\n" .
+ "php reindex_solr.php [workspace_name] [reindexall|reindexmissing|optimizeindex|reindexone|deleteindexone] [-skip {record_number}] [-reindextrunksize {trunk_size}] [-appuid {APP_UID}]\n" .
" Where \n".
" reindexall : reindex all the database. \n" .
+ " reindexone : reindex one case. -appuid parameter is required.\n" .
+ " deleteindexone : delete one case from index. -appuid parameter is required.\n" .
" reindexmissing: reindex only the missing records stored in database. \n".
" (records defined in APP_SOLR_QUEUE table are required)\n" .
" optimizeindex: optimize the changes in the search index. (used to get faster results) \n" .
@@ -39,7 +41,7 @@ $commandLineSyntaxMsg = "Invalid command line arguments: \n " .
" -reindextrunksize {trunk_size}: specify the number of records sent to index each time. \n ex: -reindextrunksize 100 //(default = 1000) \n Reduce the trunk if using big documents, and memory is not enough. \n";
if ( (count ($argv) < 3) || ((count ($argv) % 2) == 0) ||
- ($argv [2] != 'reindexall' && $argv [2] != 'reindexmissing' && $argv [2] != 'optimizeindex' && $argv [2] != 'reindexone')) {
+ ($argv [2] != 'reindexall' && $argv [2] != 'reindexmissing' && $argv [2] != 'optimizeindex' && $argv [2] != 'reindexone' && $argv [2] != 'deleteindexone')) {
print $commandLineSyntaxMsg;
die ();
}
@@ -338,6 +340,12 @@ function processWorkspace()
}
$oAppSolr->updateApplicationSearchIndex ($appUid, false);
}
+ if($ScriptAction == "deleteindexone"){
+ if($appUid == ""){
+ print "Missing -appuid parameter. please complete it with this option.\n";
+ }
+ $oAppSolr->deleteApplicationSearchIndex ($appUid, false);
+ }
}
else {
print "Incomplete Solr configuration. See configuration file: " . PATH_DATA_SITE . "env.ini";
diff --git a/workflow/engine/classes/class.AppDocumentDrive.php b/workflow/engine/classes/class.AppDocumentDrive.php
new file mode 100644
index 000000000..ba7e5f41b
--- /dev/null
+++ b/workflow/engine/classes/class.AppDocumentDrive.php
@@ -0,0 +1,485 @@
+drive = new PMDrive();
+ $status = $this->drive->getStatusService();
+ $status = !empty($status) ? ($status == 1 ? true : false): false;
+ $this->usersDrive = '';
+ $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 addUserDrive ($email)
+ {
+ if (empty($email)) {
+ return;
+ }
+ if ($this->usersDrive == '') {
+ $this->usersDrive = $email;
+ } else {
+ $emails = explode('|', $this->usersDrive);
+ if (array_search($email, $emails) === false) {
+ $this->usersDrive .= '|' . $email;
+ }
+ }
+ }
+ /**
+ * @param AppDocument $appDoc
+ * @param array $arrayTask
+ * @param $arrayData
+ *
+ * @throws \Exception
+ */
+ public function getEmailUsersTask($arrayTask, $arrayData)
+ {
+ try {
+ G::LoadClass("tasks");
+ G::LoadClass("groups");
+ G::LoadClass("spool");
+
+ $task = new Tasks();
+ $group = new Groups();
+ $oUser = new Users();
+
+ foreach ($arrayTask as $aTask) {
+ switch ($aTask["TAS_ASSIGN_TYPE"]) {
+ case "SELF_SERVICE":
+ if (isset($aTask["TAS_UID"]) && !empty($aTask["TAS_UID"])) {
+ $usersTask = array();
+
+ $groupsTask = $task->getGroupsOfTask($aTask["TAS_UID"], 1);
+
+ foreach ($groupsTask as $arrayGroup) {
+ $usersGroup = $group->getUsersOfGroup($arrayGroup["GRP_UID"]);
+
+ foreach ($usersGroup as $userGroup) {
+ $usersTask[] = $userGroup["USR_UID"];
+ }
+ }
+
+ $groupsTask = $task->getUsersOfTask($aTask["TAS_UID"], 1);
+
+ foreach ($groupsTask as $userGroup) {
+ $usersTask[] = $userGroup["USR_UID"];
+ }
+
+ $criteria = new Criteria("workflow");
+
+ $criteria->addSelectColumn(UsersPeer::USR_UID);
+ $criteria->addSelectColumn(UsersPeer::USR_EMAIL);
+ $criteria->add(UsersPeer::USR_UID, $usersTask, Criteria::IN);
+ $rsCriteria = UsersPeer::doSelectRs($criteria);
+ $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+ while ($rsCriteria->next()) {
+ $row = $rsCriteria->getRow();
+ $this->addUserDrive($row['USR_EMAIL']);
+ }
+ }
+ break;
+ case "MULTIPLE_INSTANCE":
+ $oDerivation = new Derivation();
+ $userFields = $oDerivation->getUsersFullNameFromArray($oDerivation->getAllUsersFromAnyTask($aTask["TAS_UID"]));
+ if(isset($userFields)){
+ foreach($userFields as $row){
+ $this->addUserDrive($row['USR_EMAIL']);
+ }
+ }
+ break;
+ case "MULTIPLE_INSTANCE_VALUE_BASED":
+ $taskNext = $task->load($aTask["TAS_UID"]);
+ if(isset($taskNext["TAS_ASSIGN_VARIABLE"]) && !empty($taskNext["TAS_ASSIGN_VARIABLE"])){
+ $nextTaskAssignVariable = trim($taskNext["TAS_ASSIGN_VARIABLE"], " @#");
+ $arrayUsers = $arrayData[$nextTaskAssignVariable];
+ $oDerivation = new Derivation();
+ $userFields = $oDerivation->getUsersFullNameFromArray($arrayUsers);
+ foreach ($userFields as $row) {
+ $this->addUserDrive($row['USR_EMAIL']);
+ }
+ }
+ break;
+ default:
+ if (isset($aTask["USR_UID"]) && !empty($aTask["USR_UID"])) {
+ $aUser = $oUser->load($aTask["USR_UID"]);
+ $this->addUserDrive($aUser["USR_EMAIL"]);
+ }
+ break;
+ }
+ }
+ } 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, $arrayTask, $arrayData )
+ {
+ $this->getEmailUsersTask($arrayTask, $arrayData);
+
+ $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();
+ $row['SYNC_PERMISSIONS'] = $this->usersDrive;
+ $appDoc->update($row);
+ }
+ }
+}
\ No newline at end of file
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index be4b44de6..79f685b05 100755
--- a/workflow/engine/classes/class.case.php
+++ b/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);
@@ -4232,10 +4127,9 @@ class Cases
/*----------------------------------********---------------------------------*/
$licensedFeatures = &PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
- G::LoadClass( "pmDrive" );
- $pmDrive = new PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
- if (!empty($enablePMGmail) && $enablePMGmail == 1) {
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ if ($drive->getStatusDrive()) {
$pmGmail = new \ProcessMaker\BusinessModel\Pmgmail();
$pmGmail->modifyMailToPauseCase($aData['APP_UID'], $aData['APP_DEL_INDEX']);
}
@@ -4341,10 +4235,9 @@ class Cases
/*----------------------------------********---------------------------------*/
$licensedFeatures = &PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
- G::LoadClass( "pmDrive" );
- $pmDrive = new PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
- if (!empty($enablePMGmail) && $enablePMGmail == 1) {
+ G::LoadClass("AppDocumentDrive");
+ $drive = new AppDocumentDrive();
+ if ($drive->getStatusDrive()) {
$pmGmail = new \ProcessMaker\BusinessModel\Pmgmail();
$pmGmail->modifyMailToUnpauseCase($aData['APP_UID'], $aData['DEL_INDEX']);
}
@@ -4729,15 +4622,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 +4682,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 +4759,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 +4826,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 +4933,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 +5036,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'],
diff --git a/workflow/engine/classes/class.labelsGmail.php b/workflow/engine/classes/class.labelsGmail.php
index 6b6680c8d..75eb9cfff 100644
--- a/workflow/engine/classes/class.labelsGmail.php
+++ b/workflow/engine/classes/class.labelsGmail.php
@@ -12,6 +12,7 @@ class labelsGmail
}
} catch (Exception $e) {
print G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage();
+ throw ($e);
}
return $labels;
}
@@ -34,6 +35,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);
}
}
@@ -63,62 +65,63 @@ 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) {
- 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");
+ 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);
+ $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'];
- }
+ 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'];
+ //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;
+ //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);
+ $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 == 'DRAFT'){
+ $labelsToRemove = $labelsIds['Draft'];
+ $labelsToSearch = "*-draft";
+ $labelsToAdd = $labelsIds['Paused'];
+ }
- if($appStatus == 'TO_DO'){
- $labelsToRemove = $labelsIds['Inbox'];
- $labelsToSearch = "*-inbox";
- $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));
- }
- }
+ $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';
@@ -171,7 +174,7 @@ class labelsGmail
}
}
- public function setLabels($caseId, $index, $actualLastIndex, $unassigned=false){
+ public function setLabels($caseId, $index, $actualLastIndex, $unassigned=false){
//First getting the actual thread data
$Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
$appData = $Pmgmail->getDraftApp($caseId, $index);
@@ -183,6 +186,7 @@ class labelsGmail
$proName = $application['APP_PRO_TITLE'];
$threadStatus = $application['DEL_THREAD_STATUS'];
$appStatus = $application['APP_STATUS'];
+ $tasUid = $application['TAS_UID'];
}
if($threadStatus == 'CLOSED' || $unassigned == true) {
@@ -223,7 +227,6 @@ class labelsGmail
//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) {
@@ -232,9 +235,58 @@ class labelsGmail
$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('https://www.googleapis.com/auth/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.
*
@@ -245,13 +297,13 @@ class labelsGmail
*/
public function deleteLabel($service, $user, $labelId)
{
- try {
- $service->users_labels->delete($user, $labelId);
- } catch (Exception $e) {
- error_log(G::LoadTranslation("ID_PMGMAIL_GENERAL_ERROR") . $e->getMessage());
- }
+ try {
+ $service->users_labels->delete($user, $labelId);
+ } catch (Exception $e) {
+ 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.
@@ -259,59 +311,98 @@ class labelsGmail
*/
public function deletePMGmailLabels($mail)
{
- 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');
- $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.';
+ 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');
+ $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.';
}
+ 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();
- $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;
+ 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;
}
}
-
diff --git a/workflow/engine/classes/class.pmDrive.php b/workflow/engine/classes/class.pmDrive.php
index 398764aaa..16915a642 100755
--- a/workflow/engine/classes/class.pmDrive.php
+++ b/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('https://www.googleapis.com/auth/drive.file');
- $this->setScope('https://www.googleapis.com/auth/drive.readonly');
- $this->setScope('https://www.googleapis.com/auth/drive.metadata.readonly');
- $this->setScope('https://www.googleapis.com/auth/drive.appdata');
- $this->setScope('https://www.googleapis.com/auth/drive.metadata');
+ $this->setScope(static::DRIVE);
+ $this->setScope(static::DRIVE_FILE);
+ $this->setScope(static::DRIVE_READONLY);
+ $this->setScope(static::DRIVE_METADATA);
+ $this->setScope(static::DRIVE_METADATA_READONLY);
+ $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('https://www.googleapis.com/auth/drive.appdata');
- $this->setScope('https://www.googleapis.com/auth/drive.apps.readonly');
- $this->setScope('https://www.googleapis.com/auth/drive.file');
- $this->setScope('https://www.googleapis.com/auth/drive.metadata');
- $this->setScope('https://www.googleapis.com/auth/drive.metadata.readonly');
- $this->setScope('https://www.googleapis.com/auth/drive.readonly');
+ $this->setScope(static::DRIVE);
+ $this->setScope(static::DRIVE_APPDATA);
+ $this->setScope(static::DRIVE_APPS_READONLY);
+ $this->setScope(static::DRIVE_FILE);
+ $this->setScope(static::DRIVE_METADATA);
+ $this->setScope(static::DRIVE_METADATA_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('https://www.googleapis.com/auth/drive.file');
+ $this->setScope(static::DRIVE);
+ $this->setScope(static::DRIVE_FILE);
$service = $this->serviceDrive();
+ $permission = null;
$newPermission = new Google_Service_Drive_Permission();
$newPermission->setValue($value);
diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index bba15e712..7c0a83865 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -373,24 +373,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);
@@ -402,14 +388,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"]);
}
diff --git a/workflow/engine/classes/class.pmGoogleApi.php b/workflow/engine/classes/class.pmGoogleApi.php
index 89426007a..8d7d72c0a 100755
--- a/workflow/engine/classes/class.pmGoogleApi.php
+++ b/workflow/engine/classes/class.pmGoogleApi.php
@@ -9,6 +9,15 @@ 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';
+
private $scope = array();
private $serviceAccountEmail;
private $serviceAccountP12;
@@ -244,13 +253,13 @@ class PMGoogleApi
{
$scope = array(
- 'https://www.googleapis.com/auth/drive',
- 'https://www.googleapis.com/auth/drive.file',
- 'https://www.googleapis.com/auth/drive.readonly',
- 'https://www.googleapis.com/auth/drive.metadata.readonly',
- 'https://www.googleapis.com/auth/drive.appdata',
- 'https://www.googleapis.com/auth/drive.metadata',
- 'https://www.googleapis.com/auth/drive.photos.readonly'
+ static::DRIVE,
+ static::DRIVE_FILE,
+ static::DRIVE_READONLY,
+ static::DRIVE_METADATA,
+ static::DRIVE_METADATA_READONLY,
+ static::DRIVE_APPDATA,
+ static::DRIVE_PHOTOS_READONLY
);
if ($credentials->typeAuth == 'webApplication') {
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 6f0b619d6..aab78134d 100755
--- a/workflow/engine/classes/class.wsBase.php
+++ b/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') {
- $result = new wsResponse( 0, G::loadTranslation( 'ID_MESSAGE_SENT' ) . ": " . $sTo );
+ if ($oSpool->status == 'sent') {
+ $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() );
diff --git a/workflow/engine/classes/model/AppDocument.php b/workflow/engine/classes/model/AppDocument.php
index 6e055f881..1fc120fe7 100755
--- a/workflow/engine/classes/model/AppDocument.php
+++ b/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) : '';
+ }*/
/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/classes/model/AppFolder.php b/workflow/engine/classes/model/AppFolder.php
index 5bf78d81a..c26c31d91 100755
--- a/workflow/engine/classes/model/AppFolder.php
+++ b/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);
- /*----------------------------------********---------------------------------*/
- if ($enablePMGmail) {
- $oCriteria->addSelectColumn(AppDocumentPeer::APP_DOC_DRIVE_DOWNLOAD);
- }
- /*----------------------------------********---------------------------------*/
+ $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 )) {
diff --git a/workflow/engine/classes/model/GmailRelabeling.php b/workflow/engine/classes/model/GmailRelabeling.php
new file mode 100644
index 000000000..29102525c
--- /dev/null
+++ b/workflow/engine/classes/model/GmailRelabeling.php
@@ -0,0 +1,19 @@
+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
diff --git a/workflow/engine/classes/model/map/GmailRelabelingMapBuilder.php b/workflow/engine/classes/model/map/GmailRelabelingMapBuilder.php
new file mode 100644
index 000000000..02a53d1bb
--- /dev/null
+++ b/workflow/engine/classes/model/map/GmailRelabelingMapBuilder.php
@@ -0,0 +1,86 @@
+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
diff --git a/workflow/engine/classes/model/om/BaseAppDocument.php b/workflow/engine/classes/model/om/BaseAppDocument.php
index 8fff73e3a..d6b9eb56e 100755
--- a/workflow/engine/classes/model/om/BaseAppDocument.php
+++ b/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);
diff --git a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php b/workflow/engine/classes/model/om/BaseAppDocumentPeer.php
index f9373766f..988637f48 100755
--- a/workflow/engine/classes/model/om/BaseAppDocumentPeer.php
+++ b/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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, )
+ 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, 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', '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, 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_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_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_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 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, 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, '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, 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);
diff --git a/workflow/engine/classes/model/om/BaseGmailRelabeling.php b/workflow/engine/classes/model/om/BaseGmailRelabeling.php
new file mode 100644
index 000000000..9a5bd34e2
--- /dev/null
+++ b/workflow/engine/classes/model/om/BaseGmailRelabeling.php
@@ -0,0 +1,944 @@
+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 true is returned; otherwise
+ * an aggreagated array of ValidationFailed objects will be returned.
+ *
+ * @param array $columns Array of column names to validate.
+ * @return mixed true if all validations pass;
+ array of ValidationFailed 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;
+ }
+}
+
diff --git a/workflow/engine/classes/model/om/BaseGmailRelabelingPeer.php b/workflow/engine/classes/model/om/BaseGmailRelabelingPeer.php
new file mode 100644
index 000000000..ee23b25a1
--- /dev/null
+++ b/workflow/engine/classes/model/om/BaseGmailRelabelingPeer.php
@@ -0,0 +1,602 @@
+ 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.
+ *
+ * $c->addAlias("alias1", TablePeer::TABLE_NAME);
+ * $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
+ *
+ * @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');
+}
+
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index fb0cde013..9e02da358 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -191,6 +191,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -222,6 +234,10 @@
+
+
+
+
@@ -5230,4 +5246,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 13078cd90..8f66c4477 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/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';
@@ -2928,3 +2930,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;
+
diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php
index 42efa294e..ae1472406 100755
--- a/workflow/engine/methods/cases/casesListExtJsRedirector.php
+++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php
@@ -2,12 +2,12 @@
if (typeof window.parent != 'undefined') {
verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
- G::LoadClass( "pmDrive" );
- $pmDrive = new PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ $statusPMGmail = $drive->getStatusDrive();
}
/*----------------------------------********---------------------------------*/
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){
- echo '} else { window.parent.location.href = \'derivatedGmail\'; }';
+ if(PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail){
+ echo '} else { window.parent.location.href = \'derivatedGmail\'; }';
} else {
/*----------------------------------********---------------------------------*/
echo '} else { window.parent.location.href = \'casesListExtJs\'; }';
diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php
index b98077be8..7b0489381 100755
--- a/workflow/engine/methods/cases/casesStartPage_Ajax.php
+++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php
@@ -263,18 +263,16 @@ function startCase ()
/*----------------------------------********---------------------------------*/
//sending the email for gmail integration if the option es available
- $licensedFeatures = &PMLicensedFeatures::getSingleton();
+ $licensedFeatures = &PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
- $enablePMGmail = false;
- G::LoadClass( "pmDrive" );
- $pmDrive = new PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
- if(!empty($enablePMGmail) && $enablePMGmail==1){
- require_once 'src/ProcessMaker/BusinessModel/Pmgmail.php';
- $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
- $response = $Pmgmail->sendEmail($aData['APPLICATION'], "", $aData['INDEX']);
- }
+ if($drive->getStatusDrive()){
+ require_once 'src/ProcessMaker/BusinessModel/Pmgmail.php';
+ $Pmgmail = new \ProcessMaker\BusinessModel\Pmgmail();
+ $response = $Pmgmail->sendEmail($aData['APPLICATION'], "", $aData['INDEX']);
+ }
}
/*----------------------------------********---------------------------------*/
diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php
index 060a09d5e..61d5f6e45 100755
--- a/workflow/engine/methods/cases/cases_CatchExecute.php
+++ b/workflow/engine/methods/cases/cases_CatchExecute.php
@@ -67,12 +67,20 @@ $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");
+ G::LoadClass("AppDocumentDrive");
+ $drive = new AppDocumentDrive();
+ if ($drive->getStatusDrive()) {
+ $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( '' );
diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php
index b8f7b4af6..5740f8e43 100755
--- a/workflow/engine/methods/cases/cases_Derivate.php
+++ b/workflow/engine/methods/cases/cases_Derivate.php
@@ -183,6 +183,18 @@ try {
}
// Send notifications Mobile - End
+ // Set users drive - start
+ $licensedFeatures = &PMLicensedFeatures::getSingleton();
+ if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ if ($drive->getStatusDrive()) {
+ $drive->addUserDrive($aUser['USR_EMAIL']);
+ $drive ->addUsersDocumentDrive($appFields['APP_UID'], $_POST['form']['TASKS'], $appFields['APP_DATA']);
+ }
+ }
+ // Set users drive - End
+
// Events - Start
$oEvent = new Event();
@@ -214,7 +226,7 @@ try {
$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';
}
diff --git a/workflow/engine/methods/cases/cases_SaveData.php b/workflow/engine/methods/cases/cases_SaveData.php
index c714f69a8..428daca3e 100755
--- a/workflow/engine/methods/cases/cases_SaveData.php
+++ b/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
diff --git a/workflow/engine/methods/cases/cases_ShowDocument.php b/workflow/engine/methods/cases/cases_ShowDocument.php
index 3a7db552e..17d63f6ef 100755
--- a/workflow/engine/methods/cases/cases_ShowDocument.php
+++ b/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('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+ 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
+ }
+
+
+
}
}
diff --git a/workflow/engine/methods/cases/cases_ShowOutputDocument.php b/workflow/engine/methods/cases/cases_ShowOutputDocument.php
index 61e7e667c..064ecd863 100755
--- a/workflow/engine/methods/cases/cases_ShowOutputDocument.php
+++ b/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('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
+ 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);
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 6afaf0d2f..a5f8962c4 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/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 ), '' );
}
diff --git a/workflow/engine/methods/cases/derivatedGmail.php b/workflow/engine/methods/cases/derivatedGmail.php
index d2fbff684..6fb43eb70 100644
--- a/workflow/engine/methods/cases/derivatedGmail.php
+++ b/workflow/engine/methods/cases/derivatedGmail.php
@@ -32,13 +32,11 @@ 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( "pmDrive" );
-$pmDrive = new PMDrive();
-$enablePMGmail = $pmDrive->getStatusService();
-if(key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail==1 ){
+G::LoadClass( "AppDocumentDrive" );
+$drive = new AppDocumentDrive();
+if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $drive->getStatusDrive() ){
$_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';
diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php
index 06c064616..191083c03 100755
--- a/workflow/engine/methods/cases/open.php
+++ b/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" );
- $pmDrive = new PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
- if (key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && !empty($enablePMGmail) && $enablePMGmail == 1) {
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ if (array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $drive->getStatusDrive()) {
$_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 );
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 802cc7e5a..ba4c7579e 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -1044,11 +1044,11 @@ class Cases
}
/*----------------------------------********---------------------------------*/
$licensedFeatures = &\PMLicensedFeatures::getSingleton();
- $enablePMGmail = false;
+ $statusPMGmail = false;
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
- G::LoadClass( "pmDrive" );
- $pmDrive = new \PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ $statusPMGmail = $drive->getStatusDrive();
}
/*----------------------------------********---------------------------------*/
$aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
@@ -1169,11 +1169,8 @@ 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 ($statusPMGmail) {
+ $aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) {
@@ -1249,11 +1246,8 @@ class Cases
$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 ($statusPMGmail) {
+ $aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) {
@@ -1321,11 +1315,8 @@ 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 ($statusPMGmail) {
+ $aFields['DOWNLOAD_LINK'] = $drive->changeUrlDrive($aRow, 'INPUT');
}
/*----------------------------------********---------------------------------*/
if ($lastVersion == $aRow['DOC_VERSION']) {
@@ -1373,11 +1364,11 @@ class Cases
}
/*----------------------------------********---------------------------------*/
$licensedFeatures = &\PMLicensedFeatures::getSingleton();
- $enablePMGmail = false;
+ $statusPMGmail = false;
if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
- G::LoadClass( "pmDrive" );
- $pmDrive = new \PMDrive();
- $enablePMGmail = $pmDrive->getStatusService();
+ G::LoadClass( "AppDocumentDrive" );
+ $drive = new AppDocumentDrive();
+ $statusPMGmail = $drive->getStatusDrive();
}
/*----------------------------------********---------------------------------*/
$aObjectPermissions = $cases->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID);
@@ -1527,16 +1518,9 @@ class Cases
}
/*----------------------------------********---------------------------------*/
//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 ($statusPMGmail) {
+ $fileDoc = $drive->changeUrlDrive($aRow, 'OUTPUT_DOC');
+ $filePdf = $drive->changeUrlDrive($aRow, 'OUTPUT_PDF');
}
/*----------------------------------********---------------------------------*/
//if both documents were generated, we choose the pdf one, only if doc was
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
index 454695576..022206879 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
@@ -284,16 +284,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();
@@ -304,19 +294,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);
}
@@ -371,15 +348,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();
@@ -391,19 +359,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);
}
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
index 6c166cc31..1a94f49ac 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/OutputDocument.php
@@ -381,128 +381,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();
diff --git a/workflow/engine/templates/admin/pmGmail.js b/workflow/engine/templates/admin/pmGmail.js
index 2f867d4b1..a4e52b59e 100644
--- a/workflow/engine/templates/admin/pmGmail.js
+++ b/workflow/engine/templates/admin/pmGmail.js
@@ -19,7 +19,6 @@ Ext.onReady(function(){
});
disableAll = function () {
- Ext.getCmp('typeAuthentication').disable();
Ext.getCmp('email_service_account').disable();
Ext.getCmp('file_p12').disable();
Ext.getCmp('labelFileP12').disable();
@@ -41,12 +40,10 @@ Ext.onReady(function(){
};
var enableTypeP12 = function () {
- Ext.getCmp('typeAuthentication').enable();
Ext.getCmp('email_service_account').enable();
Ext.getCmp('file_p12').enable();
Ext.getCmp('labelFileP12').enable();
- Ext.getCmp('typeAuthentication').show();
Ext.getCmp('email_service_account').show();
Ext.getCmp('file_p12').show();
Ext.getCmp('labelFileP12').show();
@@ -55,23 +52,16 @@ Ext.onReady(function(){
};
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();
- }
+ enableTypeP12();
};
var configurationPMGmail = new Ext.form.FieldSet({
@@ -89,9 +79,7 @@ Ext.onReady(function(){
check : function(that, checked) {
disableAll();
if (checked) {
- Ext.getCmp('typeAuthentication').enable();
- Ext.getCmp('typeAuthentication').show();
- Ext.getCmp('typeAuthentication').clearValue();
+ enableTypeP12();
} else {
Ext.MessageBox.confirm(
_('ID_CONFIRM'),
@@ -122,11 +110,12 @@ Ext.onReady(function(){
forceSelection: true,
store: new Ext.data.SimpleStore({
fields: ['value','type'],
- data: [['webApplication','Web Application'],['serviceAccount', 'Service Account']],
+ data: [['webApplication', 'ID_WEB_APPLICATION'],['serviceAccount', 'ID_SERVICE_ACCOUNT']],
autoLoad: true
}),
submitValue : true,
value: typeAuthentication,
+ hidden: true,
valueField: 'value',
displayField: 'type',
width: 250,
@@ -363,6 +352,7 @@ Ext.onReady(function(){
Ext.getCmp('status_pmgmail').checked = enablePMGmail;
Ext.getCmp('status_pmgmail').setValue(enablePMGmail);
+ Ext.getCmp('typeAuthentication').setValue('serviceAccount');
if (enablePMGmail){
changeType();
}
diff --git a/workflow/public_html/pmGmail/sso.php b/workflow/public_html/pmGmail/sso.php
index 300330268..27ee3e50f 100644
--- a/workflow/public_html/pmGmail/sso.php
+++ b/workflow/public_html/pmGmail/sso.php
@@ -124,8 +124,6 @@ if ($action == "draft"){
curl_setopt( $curlApp, CURLOPT_RETURNTRANSFER, true);
curl_setopt( $curlApp, CURLOPT_SSL_VERIFYPEER,false);
curl_setopt( $curlApp, CURLOPT_CONNECTTIMEOUT, 0);
- curl_setopt( $curlApp, CURLOPT_FRESH_CONNECT, true);
- curl_setopt( $curlApp, CURLOPT_TIMEOUT_MS, 1);
$curl_response_app = curl_exec( $curlApp );
curl_close( $curlApp );