Merged 3.0.1.8 into MT-10

gulliver/system/class.rbac.php

@@ -225,7 +225,7 @@ class RBAC
             "PM_SETUP_USERS_AUTHENTICATION_SOURCES", "PER_NAME" => "Setup User Authentication Sources"
         ), array("PER_UID" => "00000000000000000000000000000035", "PER_CODE" => "PM_SETUP_LOGS", "PER_NAME" => "Setup
         Logs"
-        ), array("PER_UID" => "00000000000000000000000000000036", "PER_CODE" => "DELETE_PROCESS_CASES", "PER_NAME" =>
+        ), array("PER_UID" => "00000000000000000000000000000036", "PER_CODE" => "PM_DELETE_PROCESS_CASES", "PER_NAME" =>
             "Delete process cases"
         ), array("PER_UID" => "00000000000000000000000000000037", "PER_CODE" => "PM_EDITPERSONALINFO_CALENDAR",
             "PER_NAME" => "Edit personal info Calendar"

rbac/engine/data/mysql/insert.sql

@@ -34,7 +34,7 @@ INSERT INTO `RBAC_PERMISSIONS` VALUES
 ('00000000000000000000000000000033','PM_SETUP_PLUGINS','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
 ('00000000000000000000000000000034','PM_SETUP_USERS_AUTHENTICATION_SOURCES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
 ('00000000000000000000000000000035','PM_SETUP_LOGS','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
-('00000000000000000000000000000036','DELETE_PROCESS_CASES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
+('00000000000000000000000000000036','PM_DELETE_PROCESS_CASES','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002'),
 ('00000000000000000000000000000037','PM_EDITPERSONALINFO_CALENDAR','2016-03-01 00:00:00','0000-00-00 00:00:00',1,'00000000000000000000000000000002');
 
 INSERT INTO `RBAC_ROLES` VALUES

workflow/engine/bin/cron_single.php

@@ -265,6 +265,20 @@ try {
             define('DB_ADAPTER', $DB_ADAPTER);
         }
 
+        //Set Time Zone
+        $systemUtcTimeZone = false;
+
+        /*----------------------------------********---------------------------------*/
+        if (PMLicensedFeatures::getSingleton()->verifyfeature('oq3S29xemxEZXJpZEIzN01qenJUaStSekY4cTdJVm5vbWtVM0d4S2lJSS9qUT0=')) {
+            $systemUtcTimeZone = (int)($arraySystemConfiguration['system_utc_time_zone']) == 1;
+        }
+        /*----------------------------------********---------------------------------*/
+
+        ini_set('date.timezone', ($systemUtcTimeZone)? 'UTC' : $arraySystemConfiguration['time_zone']); //Set Time Zone
+
+        define('TIME_ZONE', ini_get('date.timezone'));
+
+        //Processing
         eprintln('Processing workspace: ' . $workspace, 'green');
 
         try {

workflow/engine/content/translations/english/processmaker.en.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ProcessMaker (Branch 3.0.1.8)\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-03-18 20:11:58\n"
+"PO-Revision-Date: 2016-03-30 19:23:50\n"
 "Last-Translator: \n"
 "Language-Team: Colosa Developers Team <developers@colosa.com>\n"
 "MIME-Version: 1.0\n"
@@ -10558,8 +10558,8 @@ msgstr "Switching Skin"
 # TRANSLATION
 # LABEL/ID_CONFIRM_REMOVE_FIELD
 #: LABEL/ID_CONFIRM_REMOVE_FIELD
-msgid "Do you want to remove this field?"
-msgstr "Do you want to remove this field?"
+msgid "Do you want to remove the selected rows?"
+msgstr "Do you want to remove the selected rows?"
 
 # TRANSLATION
 # LABEL/ID_INVALID_EXTENSION
@@ -27167,6 +27167,42 @@ msgstr "An integer or decimal number"
 msgid "An email address"
 msgstr "An email address"
 
+# TRANSLATION
+# LABEL/ID_NORMAL_EXPORT
+#: LABEL/ID_NORMAL_EXPORT
+msgid "[LABEL/ID_NORMAL_EXPORT] Normal"
+msgstr "Normal"
+
+# TRANSLATION
+# LABEL/ID_GRANULAR_EXPORT
+#: LABEL/ID_GRANULAR_EXPORT
+msgid "Granular"
+msgstr "Granular"
+
+# TRANSLATION
+# LABEL/ID_EXPORT_PROCESS_OBJECTS
+#: LABEL/ID_EXPORT_PROCESS_OBJECTS
+msgid "Export Process Objects"
+msgstr "Export Process Objects"
+
+# TRANSLATION
+# LABEL/ID_IMPORT_PROCESS_OBJECTS
+#: LABEL/ID_IMPORT_PROCESS_OBJECTS
+msgid "Import Process Objects"
+msgstr "Import Process Objects"
+
+# TRANSLATION
+# LABEL/ID_ADD_TO_EXISTING
+#: LABEL/ID_ADD_TO_EXISTING
+msgid "Add to existing"
+msgstr "Add to existing"
+
+# TRANSLATION
+# LABEL/ID_REPLACE_ALL
+#: LABEL/ID_REPLACE_ALL
+msgid "Replace all"
+msgstr "Replace all"
+
 # additionalTables/additionalTablesData.xml?ADD_TAB_NAME
 # additionalTables/additionalTablesData.xml
 #: text - ADD_TAB_NAME

workflow/engine/methods/cases/cases_Step.php

@@ -215,7 +215,7 @@ if(preg_match("/^.*\(.*MSIE (\d+)\..+\).*$/", $_SERVER["HTTP_USER_AGENT"], $arra
     $ieVersion = intval($arrayMatch[1]);
 }
 
-if (isset( $_GET['breakpoint'] ) && $ieVersion != 11) {
+if (isset($_GET['breakpoint'])) {
 
     $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameLoader' );
     $G_PUBLISH->AddContent( 'view', 'cases/showDebugFrameBreaker' );

workflow/engine/methods/processes/mainInit.php

@@ -82,7 +82,7 @@ $oHeadPublisher->assign('extJsViewState', $oHeadPublisher->getExtJsViewState());
 
 $deleteCasesFlag = false;
 global $RBAC;
-if($RBAC->userCanAccess('DELETE_PROCESS_CASES') === 1) {
+if($RBAC->userCanAccess('PM_DELETE_PROCESS_CASES') === 1) {
     $deleteCasesFlag = true;
 }
 $oHeadPublisher->assign('deleteCasesFlag', $deleteCasesFlag);

workflow/engine/methods/processes/processes_DeleteCases.php

@@ -1,6 +1,6 @@
 <?php
 global $RBAC;
-$RBAC->requirePermissions( 'DELETE_PROCESS_CASES', 'PM_FACTORY' );
+$RBAC->requirePermissions( 'PM_DELETE_PROCESS_CASES', 'PM_FACTORY' );
 
 try {
     $uids = explode(',', $_POST['PRO_UIDS']);

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

@@ -1182,7 +1182,7 @@ class TimerEvent
             //Start Timer-Event (start new case) ///////////////////////////////////////////////////////////////////////
             $common->frontEndShow("START");
 
-            $this->log("START-NEW-CASES", "Date \"$datetime\": Start new cases");
+            $this->log("START-NEW-CASES", "Date \"$datetime (UTC +00:00)\": Start new cases");
 
             //Query
             $criteria = $this->getTimerEventCriteria();
@@ -1349,17 +1349,17 @@ class TimerEvent
             }
 
             if (!$flagRecord) {
-                $common->frontEndShow("TEXT", "Not exists any record to start a new case, on date \"$datetime\"");
+                $common->frontEndShow("TEXT", "Not exists any record to start a new case, on date \"$datetime (UTC +00:00)\"");
 
                 $this->log("NO-RECORDS", "Not exists any record to start a new case");
             }
 
             $common->frontEndShow("END");
 
-            $this->log("END-NEW-CASES", "Date \"$datetime\": End new cases");
+            $this->log("END-NEW-CASES", "Date \"$datetime (UTC +00:00)\": End new cases");
 
             //Intermediate Catch Timer-Event (continue the case) ///////////////////////////////////////////////////////
-            $this->log("START-CONTINUE-CASES", "Date \"$datetime\": Start continue the cases");
+            $this->log("START-CONTINUE-CASES", "Date \"$datetime (UTC +00:00)\": Start continue the cases");
 
             //Query
             $criteriaMain = $this->getTimerEventCriteria();
@@ -1555,14 +1555,14 @@ class TimerEvent
             } while ($flagNextRecord);
 
             if (!$flagRecord) {
-                $common->frontEndShow("TEXT", "Not exists any record to continue a case, on date \"$datetime\"");
+                $common->frontEndShow("TEXT", "Not exists any record to continue a case, on date \"$datetime (UTC +00:00)\"");
 
                 $this->log("NO-RECORDS", "Not exists any record to continue a case");
             }
 
             $common->frontEndShow("END");
 
-            $this->log("END-CONTINUE-CASES", "Date \"$datetime\": End continue the cases");
+            $this->log("END-CONTINUE-CASES", "Date \"$datetime (UTC +00:00)\": End continue the cases");
         } catch (\Exception $e) {
             throw $e;
         }

workflow/engine/src/ProcessMaker/Services/Api/Light.php

@@ -170,9 +170,6 @@ class Light extends Api
             }
             /*----------------------------------********---------------------------------*/
 
-            if ($newerThan != '') {
-                $response['data'] = array_reverse($response['data']);
-            }
             $result   = $this->parserDataTodo($response['data']);
             return DateTime::convertUtcToIso8601($result, $this->arrayFieldIso8601);
         } catch (\Exception $e) {
@@ -264,9 +261,6 @@ class Light extends Api
             }
             /*----------------------------------********---------------------------------*/
 
-            if ($newerThan != '') {
-                $response['data'] = array_reverse($response['data']);
-            }
             $result   = $this->parserDataDraft($response['data']);
             return DateTime::convertUtcToIso8601($result, $this->arrayFieldIso8601);
         } catch (\Exception $e) {
@@ -367,9 +361,6 @@ class Light extends Api
             }
             /*----------------------------------********---------------------------------*/
 
-            if ($newerThan != '') {
-                $response['data'] = array_reverse($response['data']);
-            }
             $result = $this->parserDataParticipated($response['data']);
             return DateTime::convertUtcToIso8601($result, $this->arrayFieldIso8601);
         } catch (\Exception $e) {
@@ -835,6 +826,13 @@ class Light extends Api
     {
         try {
             $oCase = new \Cases();
+
+            $oAppDelegate = new \AppDelegation();
+            $alreadyRouted = $oAppDelegate->alreadyRouted($app_uid, $cas_index);
+            if ($alreadyRouted) {
+                throw (new RestException(Api::STAT_APP_EXCEPTION, G::LoadTranslation('ID_CASE_DELEGATION_ALREADY_CLOSED')));
+            }
+
             $userUid = $this->getUserId();
             $_SESSION["APPLICATION"]  = $app_uid;
             $_SESSION["PROCESS"]      = $pro_uid;