From e1da377db149e78053c139edba88c9dacf02a5a7 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Wed, 18 Jan 2017 16:38:39 -0400 Subject: [PATCH 01/17] HOR-2501 Cases Link is not executing the redirect when the connections comes from a Mobile Device. --- gulliver/system/class.g.php | 33 ---------- workflow/engine/classes/class.pmFunctions.php | 19 ------ workflow/engine/methods/cases/opencase.php | 63 +++++++++---------- workflow/public_html/sysGeneric.php | 1 + 4 files changed, 31 insertions(+), 85 deletions(-) diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php index 6b593fb25..d205e663e 100644 --- a/gulliver/system/class.g.php +++ b/gulliver/system/class.g.php @@ -5792,39 +5792,6 @@ class G { return $e->getMessage(); } - - /** - * Direct case link mobile - * @access public - * - * @param string - * @param int - * - * @return string - */ - public static function caseLinkMobile($applicationUid, $delIndex = 0) - { - $application = ApplicationPeer::retrieveByPK($applicationUid); - - if (is_null($application) || !is_numeric($delIndex) || $delIndex < 0) { - return false; - } - - if ($delIndex != 0) { - $appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $delIndex); - - if (is_null($appDelegation)) { - return false; - } - - $uri = 'processmakerMobile://' . $applicationUid . '/' . $delIndex; - } else { - $uri = 'processmakerMobile://' . $applicationUid; - } - - //Return - return $uri; - } } /** diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index 8b31758aa..e76f3ce0c 100644 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -3946,22 +3946,3 @@ function PMFSendMessageToGroup( //Return return 1; } - -/** - * @method - * - * Direct case link mobile - * - * @name PMFCaseLinkMobile - * @label PMF Direct case link mobile - * @link http://wiki.processmaker.com/index.php/ProcessMaker_Functions#PMFCaseLinkMobile.28.29 - * - * @param string(32) | $applicationUid | ID of the case | The unique ID of the case - * @param int | $delIndex = 0 | Delegation index of the case | Optional parameter. The delegation index of a case - * @return string | $url | Direct case link to Mobile | Returns the direct case link to Mobile, FALSE otherwise - */ -function PMFCaseLinkMobile($applicationUid, $delIndex = 0) -{ - //Return - return G::caseLinkMobile($applicationUid, $delIndex); -} diff --git a/workflow/engine/methods/cases/opencase.php b/workflow/engine/methods/cases/opencase.php index 26331921f..82381f525 100644 --- a/workflow/engine/methods/cases/opencase.php +++ b/workflow/engine/methods/cases/opencase.php @@ -1,36 +1,29 @@ requirePermissions('PM_CASES'); +$isBrowserMobile = G::check_is_mobile(strtolower($_SERVER['HTTP_USER_AGENT'])); +if (!((defined('REDIRECT_TO_MOBILE') && REDIRECT_TO_MOBILE == 1 && $isBrowserMobile))) { + $isBrowserMobile = false; + if ($RBAC->userCanAccess('PM_CASES') != 1) { + header('location: ' . SYS_URI . 'login/login' . '?u=' . urlencode($_SERVER['REQUEST_URI'])); + die(); + } +} $G_MAIN_MENU = 'processmaker'; $G_ID_MENU_SELECTED = 'CASES'; $_POST['qs'] = ''; - $arrayAux = explode('?', $_SERVER['REQUEST_URI']); - preg_match('/^.*\/cases\/opencase\/([\w\-]{32})$/', $arrayAux[0], $arrayMatch); $applicationUid = $arrayMatch[1]; - $case = new \ProcessMaker\BusinessModel\Cases(); - $arrayApplicationData = $case->getApplicationRecordByPk($applicationUid, [], false); $G_PUBLISH = new Publisher(); -if ($arrayApplicationData !== false) { - $isBrowserMobile = G::check_is_mobile(strtolower($_SERVER['HTTP_USER_AGENT'])); - - if (!(defined('REDIRECT_TO_MOBILE') && REDIRECT_TO_MOBILE == 1 && $isBrowserMobile)) { - $_SESSION['__CD__'] = '../'; - $_SESSION['__OPEN_APPLICATION_UID__'] = $applicationUid; - - $G_PUBLISH->AddContent('view', 'cases/cases_Load'); - - $headPublisher = &headPublisher::getSingleton(); - $headPublisher->addScriptFile('/jscore/src/PM.js'); - $headPublisher->addScriptFile('/jscore/src/Sessions.js'); - } else { +if ($isBrowserMobile) { + $delIndex = 0; + if ($arrayApplicationData !== false) { $case = new \ProcessMaker\BusinessModel\Cases(); $arrayResult = $case->getStatusInfo($applicationUid, 0, $_SESSION['USER_LOGGED']); @@ -42,26 +35,30 @@ if ($arrayApplicationData !== false) { $arrayResult = $case->getStatusInfo($applicationUid); $arrayDelIndex = $arrayResult['DEL_INDEX']; } - - $delIndex = 0; - if (count($arrayDelIndex) == 1) { $delIndex = $arrayDelIndex[0]; } - - $urlMobile = G::caseLinkMobile($applicationUid, $delIndex); - - G::header('Location: ' . $urlMobile); - exit(0); } + $urlMobile = 'processmakerMobile://' . $applicationUid . '/' . $delIndex; + G::header('Location: ' . $urlMobile); + exit(0); } else { - $G_PUBLISH->AddContent( - 'xmlform', - 'xmlform', - 'login/showMessage', - '', - ['MESSAGE' => \G::LoadTranslation('ID_CASE_DOES_NOT_EXIST2', ['app_uid', $applicationUid])] - ); + if ($arrayApplicationData !== false) { + $_SESSION['__CD__'] = '../'; + $_SESSION['__OPEN_APPLICATION_UID__'] = $applicationUid; + $G_PUBLISH->AddContent('view', 'cases/cases_Load'); + $headPublisher = &headPublisher::getSingleton(); + $headPublisher->addScriptFile('/jscore/src/PM.js'); + $headPublisher->addScriptFile('/jscore/src/Sessions.js'); + } else { + $G_PUBLISH->AddContent( + 'xmlform', + 'xmlform', + 'login/showMessage', + '', + ['MESSAGE' => \G::LoadTranslation('ID_CASE_DOES_NOT_EXIST2', ['app_uid', $applicationUid])] + ); + } } G::RenderPage('publish'); diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 0b32f04eb..b7b4fb4d3 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -960,6 +960,7 @@ if (! defined( 'EXECUTE_BY_CRON' )) { $noLoginFiles[] = 'propelTableAjax'; $noLoginFiles[] = 'licenseUpdate'; $noLoginFiles[] = 'casesStreamingFile'; + $noLoginFiles[] = 'opencase'; $noLoginFolders[] = 'services'; $noLoginFolders[] = 'tracker'; From 891fc544c3b76c7d268540587bea3fcb94c99efb Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 3 Feb 2017 11:03:50 -0400 Subject: [PATCH 02/17] HOR-2621 --- workflow/engine/classes/class.case.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 8a938d803..12d71ffdc 100644 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -6864,18 +6864,15 @@ class Cases public function getCurrentDelegationCase($sApplicationUID = '') { - $oSession = new DBSession(new DBConnection()); - $oDataset = $oSession->Execute(' - SELECT - DEL_INDEX - FROM - APP_DELEGATION - WHERE - APP_UID = "' . $sApplicationUID . '" - ORDER BY DEL_DELEGATE_DATE DESC - '); - $aRow = $oDataset->Read(); - return $aRow['DEL_INDEX']; + $criteria = new \Criteria('workflow'); + $criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX); + $criteria->add(\AppDelegationPeer::APP_UID, $sApplicationUID, Criteria::EQUAL); + $criteria->add(\AppDelegationPeer::DEL_LAST_INDEX, 1, Criteria::EQUAL); + $dataSet = AppDelegationPeer::doSelectRS($criteria); + $dataSet->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $dataSet->next(); + $row = $dataSet->getRow(); + return isset($row['DEL_INDEX']) ? $row['DEL_INDEX'] : 0; } public function clearCaseSessionData() From 8872b471d41e010495a48910675fd302eb3bb42c Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Tue, 14 Feb 2017 16:06:28 -0400 Subject: [PATCH 03/17] HOR-2677 [Zendesk - 4230] Any user can claim a case with a link generated by the PMFCaseLink function --- workflow/engine/methods/cases/main_init.php | 19 +++++++++++++++---- .../src/ProcessMaker/BusinessModel/Cases.php | 7 ++++++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/workflow/engine/methods/cases/main_init.php b/workflow/engine/methods/cases/main_init.php index eb242a040..10c9e1bcd 100644 --- a/workflow/engine/methods/cases/main_init.php +++ b/workflow/engine/methods/cases/main_init.php @@ -69,7 +69,6 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) { $confDefaultOption = 'CASES_SEARCH'; $action = 'search'; - $arrayResult = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__'], 0, $_SESSION['USER_LOGGED']); $arrayDelIndex = []; @@ -89,9 +88,21 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) { $arrayDelIndex = $arrayResult['DEL_INDEX']; } else { - $arrayResult = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__']); - - $arrayDelIndex = $arrayResult['DEL_INDEX']; + $arrayResultData = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__']); + $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor(); + $isSupervisor = $supervisor->isUserProcessSupervisor($arrayResultData['PRO_UID'], $_SESSION['USER_LOGGED']); + if ($isSupervisor) { + $arrayResult = $arrayResultData; + $arrayDelIndex = $arrayResultData['DEL_INDEX']; + } else { + $_SESSION['PROCESS'] = $arrayResultData['PRO_UID']; + $_GET['APP_UID'] = $_SESSION['__OPEN_APPLICATION_UID__']; + $_SESSION['ACTION'] = 'jump'; + $_SESSION['APPLICATION'] = $_SESSION['__OPEN_APPLICATION_UID__']; + $_SESSION['INDEX'] = $arrayResultData['DEL_INDEX'][0]; + require_once(PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php'); + exit(); + } } if (count($arrayDelIndex) == 1) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 93c38834f..986069f88 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -2386,7 +2386,7 @@ class Cases if ($rsCriteria->next()) { $record = $rsCriteria->getRow(); - $arrayData = ['APP_STATUS' => $record['APP_STATUS'], 'DEL_INDEX' => []]; + $arrayData = ['APP_STATUS' => $record['APP_STATUS'], 'DEL_INDEX' => [], 'PRO_UID' => $record['PRO_UID']]; $arrayData['DEL_INDEX'][] = $record['DEL_INDEX']; while ($rsCriteria->next()) { @@ -2427,6 +2427,7 @@ class Cases $criteria->setDistinct(); $criteria->addSelectColumn($delimiter . 'PAUSED' . $delimiter . ' AS APP_STATUS'); $criteria->addSelectColumn(\AppDelayPeer::APP_DEL_INDEX . " AS DEL_INDEX"); + $criteria->addSelectColumn(\AppDelayPeer::PRO_UID); $criteria->add(\AppDelayPeer::APP_UID, $applicationUid, \Criteria::EQUAL); $criteria->add(\AppDelayPeer::APP_TYPE, "PAUSE", \Criteria::EQUAL); @@ -2468,6 +2469,7 @@ class Cases $criteria->clearSelectColumns(); $criteria->addSelectColumn($delimiter . 'UNASSIGNED' . $delimiter . ' AS APP_STATUS'); $criteria->addSelectColumn(\AppCacheViewPeer::DEL_INDEX); + $criteria->addSelectColumn(\AppCacheViewPeer::PRO_UID); $criteria->add(\AppCacheViewPeer::APP_UID, $applicationUid, \Criteria::EQUAL); @@ -2489,6 +2491,7 @@ class Cases $criteria->setDistinct(); $criteria->addSelectColumn(\ApplicationPeer::APP_STATUS); + $criteria->addSelectColumn(\ApplicationPeer::PRO_UID); $criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX); $arrayCondition = array(); @@ -2529,6 +2532,7 @@ class Cases $criteria = new \Criteria("workflow"); $criteria->addSelectColumn(\ApplicationPeer::APP_STATUS); + $criteria->addSelectColumn(\ApplicationPeer::PRO_UID); $criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX); $arrayCondition = array(); @@ -2568,6 +2572,7 @@ class Cases $criteria2->addSelectColumn($delimiter . 'PARTICIPATED' . $delimiter . ' AS APP_STATUS'); $criteria2->addSelectColumn(\AppDelegationPeer::DEL_INDEX); $criteria2->addSelectColumn(\ApplicationPeer::APP_UID); + $criteria2->addSelectColumn(\ApplicationPeer::PRO_UID); $rsCriteria2 = \ApplicationPeer::doSelectRS($criteria2); $rsCriteria2->setFetchmode(\ResultSet::FETCHMODE_ASSOC); From 47921f0b4228860630ba2c3248c8df734a01b97a Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Mon, 20 Feb 2017 16:23:27 -0400 Subject: [PATCH 04/17] HOR-2715 --- workflow/engine/src/ProcessMaker/Policies/AccessControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Policies/AccessControl.php b/workflow/engine/src/ProcessMaker/Policies/AccessControl.php index c08817c0b..d55baf08d 100644 --- a/workflow/engine/src/ProcessMaker/Policies/AccessControl.php +++ b/workflow/engine/src/ProcessMaker/Policies/AccessControl.php @@ -46,7 +46,7 @@ class AccessControl implements iAuthenticate 500, 'Authentication Class should implement iAuthenticate'); } elseif (!$authObj->{Defaults::$authenticationMethod}()) { - throw new RestException(401); + throw new RestException(403, "You don't have permission to access this endpoint on this server."); } } elseif (!$this->verifyAccess(self::$permission)) { throw new RestException(401); From 8e8f466926ad26c096bf96b37da7fa8ec8151217 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Mon, 20 Feb 2017 16:31:27 -0400 Subject: [PATCH 05/17] HOR-2715 --- workflow/engine/src/ProcessMaker/Policies/AccessControl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Policies/AccessControl.php b/workflow/engine/src/ProcessMaker/Policies/AccessControl.php index d55baf08d..f7358b31d 100644 --- a/workflow/engine/src/ProcessMaker/Policies/AccessControl.php +++ b/workflow/engine/src/ProcessMaker/Policies/AccessControl.php @@ -46,7 +46,7 @@ class AccessControl implements iAuthenticate 500, 'Authentication Class should implement iAuthenticate'); } elseif (!$authObj->{Defaults::$authenticationMethod}()) { - throw new RestException(403, "You don't have permission to access this endpoint on this server."); + throw new RestException(403, "You don't have permission to access this endpoint or resource on this server."); } } elseif (!$this->verifyAccess(self::$permission)) { throw new RestException(401); From 07adac7c3d87ab6167dd5845551712c5c990afcc Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 21 Feb 2017 15:35:32 -0400 Subject: [PATCH 06/17] HOR-2726 Grammar and typo mistakes in ProcessMaker Google Integration section - change descriptions labels --- .../translations/english/processmaker.en.po | 124 +++++++++--------- workflow/engine/data/mysql/insert.sql | 64 ++++----- 2 files changed, 94 insertions(+), 94 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 3348bc83e..fbfd252b8 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -2488,8 +2488,8 @@ msgstr "The PIN is invalid" # TRANSLATION # LABEL/ID_MAP #: LABEL/ID_MAP -msgid "Where is my Case?" -msgstr "Where is my Case?" +msgid "My Case Status" +msgstr "My Case Status" # TRANSLATION # LABEL/ID_DYNADOC @@ -2662,8 +2662,8 @@ msgstr "Delete Stage" # TRANSLATION # LABEL/ID_HISTORY_MESSAGES #: LABEL/ID_HISTORY_MESSAGES -msgid "My History Messages" -msgstr "My History Messages" +msgid "My Message History" +msgstr "My Message History" # TRANSLATION # LABEL/ID_STAGE @@ -4522,14 +4522,14 @@ msgstr "User Reassignment" # TRANSLATION # LABEL/ID_CASES_LIST_SETUP #: LABEL/ID_CASES_LIST_SETUP -msgid "Cases Lists" -msgstr "Cases Lists" +msgid "Case Lists" +msgstr "Case Lists" # TRANSLATION # LABEL/ID_APPCACHE_SETUP #: LABEL/ID_APPCACHE_SETUP -msgid "Cases List Cache Builder" -msgstr "Cases List Cache Builder" +msgid "Case List Cache Builder" +msgstr "Case List Cache Builder" # TRANSLATION # LABEL/ID_CLEAR_CACHE_MSG1 @@ -4750,8 +4750,8 @@ msgstr "Country" # TRANSLATION # LABEL/ID_LAN_UPDATE_DATE #: LABEL/ID_LAN_UPDATE_DATE -msgid "Update Date" -msgstr "Update Date" +msgid "Date Updated" +msgstr "Date Updated" # TRANSLATION # LABEL/ID_LAN_REV_DATE @@ -4918,8 +4918,8 @@ msgstr "Available Fields" # TRANSLATION # LABEL/ID_CASES_LIST_FIELDS #: LABEL/ID_CASES_LIST_FIELDS -msgid "Cases List Fields" -msgstr "Cases List Fields" +msgid "Case List Fields" +msgstr "Case List Fields" # TRANSLATION # LABEL/ID_TITLE_INBOX @@ -5206,8 +5206,8 @@ msgstr "All Users" # TRANSLATION # LABEL/ID_ALL_STATUS #: LABEL/ID_ALL_STATUS -msgid "All Status" -msgstr "All Status" +msgid "All Statuses" +msgstr "All Statuses" # TRANSLATION # LABEL/ID_CONFIRM @@ -5236,8 +5236,8 @@ msgstr "Debug" # TRANSLATION # LABEL/ID_PRO_CREATE_DATE #: LABEL/ID_PRO_CREATE_DATE -msgid "Create Date" -msgstr "Create Date" +msgid "Date Created" +msgstr "Date Created" # TRANSLATION # LABEL/ID_ON @@ -6352,8 +6352,8 @@ msgstr "Current User" # TRANSLATION # LABEL/ID_LAST_MODIFY #: LABEL/ID_LAST_MODIFY -msgid "[LABEL/ID_LAST_MODIFY] Last Modify" -msgstr "Last Modify" +msgid "[LABEL/ID_LAST_MODIFY] Last Modified" +msgstr "Last Modified" # TRANSLATION # LABEL/ID_DELEGATION_DATE @@ -10006,8 +10006,8 @@ msgstr "Your password is" # TRANSLATION # LABEL/ID_ENABLE_FOTGOT_PASSWORD #: LABEL/ID_ENABLE_FOTGOT_PASSWORD -msgid "Enable Forgot password" -msgstr "Enable Forgot password" +msgid "Enable Password Recovery" +msgstr "Enable Password Recovery" # TRANSLATION # LABEL/ID_NEW_PASSWORD_SENT @@ -11512,8 +11512,8 @@ msgstr "Assigned To" # TRANSLATION # LABEL/ID_DASHLETS_INSTANCES #: LABEL/ID_DASHLETS_INSTANCES -msgid "Dashlets Instances" -msgstr "Dashlets Instances" +msgid "Dashlet Instances" +msgstr "Dashlet Instances" # TRANSLATION # LABEL/ID_INPUT_DOC_DOESNT_EXIST @@ -12634,8 +12634,8 @@ msgstr "The current password is incorrect" # TRANSLATION # LABEL/ID_MAX_LIFETIME #: LABEL/ID_MAX_LIFETIME -msgid "Cookie lifetime (seconds)" -msgstr "Cookie lifetime (seconds)" +msgid "Cookie Lifetime (Seconds)" +msgstr "Cookie Lifetime (Seconds)" # TRANSLATION # LABEL/ID_SUCCESSFUL_CONNECTION @@ -13966,8 +13966,8 @@ msgstr "The system has detected that changes to the case labels will affect more # TRANSLATION # LABEL/ID_MESSAGE_LOGIN #: LABEL/ID_MESSAGE_LOGIN -msgid "The default language set here is for the \"Language\" dropdown box displayed on the login screen. This configuration is set for each workspace." -msgstr "The default language set here is for the \"Language\" dropdown box displayed on the login screen. This configuration is set for each workspace." +msgid "The default language set here is for the Language dropdown box displayed on the login screen. This configuration is set for each workspace." +msgstr "The default language set here is for the Language dropdown box displayed on the login screen. This configuration is set for each workspace." # TRANSLATION # LABEL/ID_MESSAGE_SYSTEM @@ -14518,8 +14518,8 @@ msgstr "No Emails to display" # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_CHECK #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_CHECK -msgid "Check PM requirements" -msgstr "Check PM requirements" +msgid "Check PM Requirements" +msgstr "Check PM Requirements" # TRANSLATION # LABEL/ID_PHP_INFO @@ -14542,14 +14542,14 @@ msgstr "Check again" # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION -msgid "If any of these items are not supported (marked as No), then please take actions to correct them.
" -msgstr "If any of these items are not supported (marked as No), then please take actions to correct them.
" +msgid "If any of these items are not supported (marked as \" No\"), then please take actions to correct them.
" +msgstr "If any of these items are not supported (marked as \" No\"), then please take actions to correct them.
" # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2 #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2 -msgid "Failure to do so could lead your ProcessMaker installation not functioning correctly!
" -msgstr "Failure to do so could lead your ProcessMaker installation not functioning correctly!
" +msgid "Failure to do so correctly could lead to your ProcessMaker installation not functioning correctly!
" +msgstr "Failure to do so correctly could lead to your ProcessMaker installation not functioning correctly!
" # TRANSLATION # LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP @@ -14662,8 +14662,8 @@ msgstr "Restart labels with system fields" # TRANSLATION # LABEL/ID_CASESLIST_FIELD_LABEL_RESET_ID #: LABEL/ID_CASESLIST_FIELD_LABEL_RESET_ID -msgid "Restart labels with system fields with the labels ID for its translation" -msgstr "Restart labels with system fields with the labels ID for its translation" +msgid "Restart labels with system fields with the ID of the label for its translation" +msgstr "Restart labels with system fields with the ID of the label for its translation" # TRANSLATION # LABEL/ID_SKIN_TEAM @@ -14938,8 +14938,8 @@ msgstr "Do you want to clear the information from the first row?" # TRANSLATION # LABEL/ID_FROM_NAME #: LABEL/ID_FROM_NAME -msgid "From name" -msgstr "From name" +msgid "Sender Name" +msgstr "Sender Name" # TRANSLATION # LABEL/ID_ACCEPT @@ -15418,8 +15418,8 @@ msgstr "Group cannot be deleted while it's assigned to a task" # TRANSLATION # LABEL/ID_FROM_EMAIL #: LABEL/ID_FROM_EMAIL -msgid "From Mail" -msgstr "From Mail" +msgid "Sender Email" +msgstr "Sender Email" # TRANSLATION # LABEL/ID_UNSAVED_TRIGGERS_WINDOW @@ -16702,8 +16702,8 @@ msgstr "No new versions available" # TRANSLATION # LABEL/ID_CHECK_UPDATES #: LABEL/ID_CHECK_UPDATES -msgid "Check for updates (you need to be connected to Internet)" -msgstr "Check for updates (you need to be connected to Internet)" +msgid "Check for updates (you need to be connected to the Internet)" +msgstr "Check for updates (you need to be connected to the Internet)" # TRANSLATION # LABEL/ID_YOUR_LICENSE @@ -16948,14 +16948,14 @@ msgstr "Audit Log has been disabled" # TRANSLATION # LABEL/ID_AUDIT_LOG_DETAILS_1 #: LABEL/ID_AUDIT_LOG_DETAILS_1 -msgid "When this option is enabled, all changes made in the \"ADMIN\" tab are registered in a log." -msgstr "When this option is enabled, all changes made in the \"ADMIN\" tab are registered in a log." +msgid "When this option is enabled, all changes made in the Admin tab are registered in a log." +msgstr "When this option is enabled, all changes made in the Admin tab are registered in a log." # TRANSLATION # LABEL/ID_AUDIT_LOG_DETAILS_2 #: LABEL/ID_AUDIT_LOG_DETAILS_2 -msgid "and the user will be able to see those changes in the \"Audit Log\" option in Logs Menu" -msgstr "and the user will be able to see those changes in the \"Audit Log\" option in Logs Menu" +msgid "and the user will be able to see those changes in the Audit Log option in Logs Menu" +msgstr "and the user will be able to see those changes in the Audit Log option in Logs Menu" # TRANSLATION # LABEL/ID_PRIVATE @@ -17494,8 +17494,8 @@ msgstr "Mcrypt Support" # TRANSLATION # LABEL/ID_GENERATE_INFO_SUPPORT #: LABEL/ID_GENERATE_INFO_SUPPORT -msgid "A file with the information of your System will be generated. It will help the support team to provide a better support to any issue that may appear" -msgstr "A file with the information of your System will be generated. It will help the support team to provide a better support to any issue that may appear" +msgid "A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur." +msgstr "A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur." # TRANSLATION # LABEL/ID_CURRENT_BROWSER_NOT_SUPPORTED @@ -17752,8 +17752,8 @@ msgstr "Default" # TRANSLATION # LABEL/ID_EMAIL_SERVER_ACCOUNT_FROM #: LABEL/ID_EMAIL_SERVER_ACCOUNT_FROM -msgid "[LABEL/ID_EMAIL_SERVER_ACCOUNT_FROM] Account From" -msgstr "Account From" +msgid "[LABEL/ID_EMAIL_SERVER_ACCOUNT_FROM] Sender Account" +msgstr "Sender Account" # TRANSLATION # LABEL/ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL @@ -18850,8 +18850,8 @@ msgstr "Sort by" # TRANSLATION # LABEL/ID_CUSTOM_CASES_LISTS #: LABEL/ID_CUSTOM_CASES_LISTS -msgid "Custom Cases Lists" -msgstr "Custom Cases Lists" +msgid "Custom Case List" +msgstr "Custom Case List" # TRANSLATION # LABEL/ID_NO_INEFFICIENT_PROCESSES @@ -22570,8 +22570,8 @@ msgstr "Edit permission" # TRANSLATION # LABEL/ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056 #: LABEL/ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056 -msgid "[LABEL/ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056] Status Case" -msgstr "Status Case" +msgid "[LABEL/ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056] Case Status" +msgstr "Case Status" # TRANSLATION # LABEL/ID_MAFE_521019040a0f4f7773357aa6bc22180b @@ -26062,8 +26062,8 @@ msgstr "Please enter a numeric value" # TRANSLATION # LABEL/ID_MAFE_42b5e40c0f14c557113865a3aa78b673 #: LABEL/ID_MAFE_42b5e40c0f14c557113865a3aa78b673 -msgid "Insert a SQL query like: SELECT [Key field], [Label field] FROM [Table name]" -msgstr "Insert a SQL query like: SELECT [Key field], [Label field] FROM [Table name]" +msgid "Insert an SQL query like: SELECT [Key field], [Label field] FROM [Table name]" +msgstr "Insert an SQL query like: SELECT [Key field], [Label field] FROM [Table name]" # TRANSLATION # LABEL/ID_MAFE_6b66a61fa66288a9a7ad6474d2e686ec @@ -26842,14 +26842,14 @@ msgstr "Are you sure to disable the Google Drive Integration? If you do this, th # TRANSLATION # LABEL/ID_GMAIL_HELP_ENABLE #: LABEL/ID_GMAIL_HELP_ENABLE -msgid "Enabling this option, users will be able to use the Gmail extension that allows to interact with Processamaker from the urser's Gmail web page." -msgstr "Enabling this option, users will be able to use the Gmail extension that allows to interact with Processamaker from the urser's Gmail web page." +msgid "When this option is enabled, users will be able to use the Gmail extension that allows interaction with ProcessMaker from the user's Gmail web page." +msgstr "When this option is enabled, users will be able to use the Gmail extension that allows interaction with ProcessMaker from the user's Gmail web page." # TRANSLATION # LABEL/ID_DRIVE_HELP_ENABLE #: LABEL/ID_DRIVE_HELP_ENABLE -msgid "Enabling this option will allow to store all input, output and attached documents generated in your processes in Google Drive." -msgstr "Enabling this option will allow to store all input, output and attached documents generated in your processes in Google Drive." +msgid "When this option is enabled, all input, output and attached documents generated in your processes can be stored in Google Drive." +msgstr "When this option is enabled, all input, output and attached documents generated in your processes can be stored in Google Drive." # TRANSLATION # LABEL/ID_ENABLE_PMDRIVE @@ -27440,8 +27440,8 @@ msgstr "wildcard" # TRANSLATION # LABEL/ID_MAFE_8efa191bcfbd509f1be06c9eac30cb9c #: LABEL/ID_MAFE_8efa191bcfbd509f1be06c9eac30cb9c -msgid "Fields marked with asterisk (%%ASTERISK%%) are required." -msgstr "Fields marked with asterisk (%%ASTERISK%%) are required." +msgid "Fields marked with an asterisk (%%ASTERISK%%) are required." +msgstr "Fields marked with an asterisk (%%ASTERISK%%) are required." # TRANSLATION # LABEL/ID_MAFE_c7f8f8652db6d74e086d297129179d2f @@ -27692,8 +27692,8 @@ msgstr "Supported Controls: Multiple File." # TRANSLATION # LABEL/ID_DEFAULT_EXPIRATION_YEAR #: LABEL/ID_DEFAULT_EXPIRATION_YEAR -msgid "Default user expiry date (years)" -msgstr "Default user expiry date (years)" +msgid "Default User Expiry Date (Years)" +msgstr "Default User Expiry Date (Years)" # TRANSLATION # LABEL/ID_MAFE_497f247967ea9a295c48effdc025c1a1 diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 1d7483135..888c9d980 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -1858,7 +1858,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MSG_CONFIRM_DELETE_CASE_TRACKER_OBJECT','en','Do you want to delete this object?','2014-01-15') , ( 'LABEL','ID_CASE_NOT_EXISTS','en','The case does not exist','2014-01-15') , ( 'LABEL','ID_PIN_INVALID','en','The PIN is invalid','2014-01-15') , -( 'LABEL','ID_MAP','en','Where is my Case?','2014-01-15') , +( 'LABEL','ID_MAP','en','My Case Status','2017-02-21') , ( 'LABEL','ID_DYNADOC','en','My Case Forms and Documents','2014-01-15') , ( 'LABEL','ID_HISTORY','en','My Case History','2014-01-15') , ( 'JAVASCRIPT','ID_FILEGENERATED','en','Filename generated, is required!','2014-01-15') , @@ -1887,7 +1887,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'JAVASCRIPT','ID_EDIT_STAGES_MAP','en','Edit Stages Map','2014-01-15') , ( 'JAVASCRIPT','ID_PROCESSMAP_ADD_STAGE','en','Add Stage','2014-01-15') , ( 'JAVASCRIPT','ID_PROCESSMAP_DELETE_STAGE','en','Delete Stage','2014-01-15') , -( 'LABEL','ID_HISTORY_MESSAGES','en','My History Messages','2014-01-15') , +( 'LABEL','ID_HISTORY_MESSAGES','en','My Message History','2017-02-21') , ( 'LABEL','ID_STAGE','en','Stage','2014-01-15') , ( 'JAVASCRIPT','ID_PROCESSMAP_CONFIRM_DELETE_STAGE','en','Do you want to delete the stage:','2014-01-15') , ( 'JAVASCRIPT','ID_PROCESSMAP_EDIT','en','Edit','2014-01-15') , @@ -2204,8 +2204,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PROCESS_NO_CATEGORY','en','No Category','2014-01-15') , ( 'LABEL','ID_USER_TO_REASSIGN','en','Reassign to:','2014-01-15') , ( 'LABEL','ID_REASSIGN_USERS','en','User Reassignment','2014-01-15') , -( 'LABEL','ID_CASES_LIST_SETUP','en','Cases Lists','2015-04-28') , -( 'LABEL','ID_APPCACHE_SETUP','en','Cases List Cache Builder','2014-01-15') , +( 'LABEL','ID_CASES_LIST_SETUP','en','Case Lists','2017-02-21') , +( 'LABEL','ID_APPCACHE_SETUP','en','Case List Cache Builder','2017-02-21') , ( 'LABEL','ID_CLEAR_CACHE_MSG1','en','All cache data was deleted','2014-01-15') , ( 'LABEL','ID_CLEAR_CACHE_MSG2','en','The cache directory is empty','2014-01-15') , ( 'LABEL','ID_CASESLIST_APP_UID','en','Case Id','2014-01-15') , @@ -2242,7 +2242,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_LANG_INSTALL_UPDATE','en','Install / Update','2014-01-15') , ( 'LABEL','ID_LAN_LANGUAGE','en','Language','2014-01-15') , ( 'LABEL','ID_LAN_COUNTRY','en','Country','2014-01-15') , -( 'LABEL','ID_LAN_UPDATE_DATE','en','Update Date','2014-01-15') , +( 'LABEL','ID_LAN_UPDATE_DATE','en','Date Updated','2017-02-21') , ( 'LABEL','ID_LAN_REV_DATE','en','Revision Date','2014-01-15') , ( 'LABEL','ID_LAN_VERSION','en','Version','2014-01-15') , ( 'LABEL','ID_LAN_UPLOAD_TITLE','en','Upload translation file','2014-01-15') , @@ -2272,7 +2272,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_HEADER_ALIGN','en','Align','2014-01-15') , ( 'LABEL','ID_SELECTED_FIELD','en','selected field','2014-01-15') , ( 'LABEL','ID_AVAILABLE_FIELDS','en','Available Fields','2014-01-15') , -( 'LABEL','ID_CASES_LIST_FIELDS','en','Cases List Fields','2014-01-15') , +( 'LABEL','ID_CASES_LIST_FIELDS','en','Case List Fields','2017-02-21') , ( 'LABEL','ID_TITLE_INBOX','en','Inbox','2014-01-15') , ( 'LABEL','ID_TITLE_DRAFT','en','Draft','2014-01-15') , ( 'LABEL','ID_TITLE_PARTICIPATED','en','Participated','2014-01-15') , @@ -2320,12 +2320,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CASES_STATUS_PAUSED','en','Paused','2014-01-15') , ( 'LABEL','ID_ALL_PROCESS','en','All Processes','2014-01-15') , ( 'LABEL','ID_ALL_USERS','en','All Users','2014-01-15') , -( 'LABEL','ID_ALL_STATUS','en','All Status','2014-01-15') , +( 'LABEL','ID_ALL_STATUS','en','All Statuses','2017-02-21') , ( 'LABEL','ID_CONFIRM','en','Confirm','2014-01-15') , ( 'LABEL','ID_CONFIRM_UNPAUSE_CASE','en','Are you sure you want to unpause this case?','2014-01-15') , ( 'LABEL','ID_PRO_DESCRIPTION','en','Process Description','2014-01-15') , ( 'LABEL','ID_PRO_DEBUG','en','Debug','2014-01-15') , -( 'LABEL','ID_PRO_CREATE_DATE','en','Create Date','2014-01-15') , +( 'LABEL','ID_PRO_CREATE_DATE','en','Date Created','2017-02-21') , ( 'LABEL','ID_ON','en','On','2014-01-15') , ( 'LABEL','ID_OFF','en','Off','2014-01-15') , ( 'LABEL','ID_NO_SELECTION_WARNING','en','One item should be selected in order to execute the action.','2014-01-15') , @@ -2517,7 +2517,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MSG_CONFIRM_DELETE_ROW','en','Do you want to delete selected row?','2014-01-15') , ( 'LABEL','ID_SENT_BY','en','Sent By','2014-01-15') , ( 'LABEL','ID_CURRENT_USER','en','Current User','2014-01-15') , -( 'LABEL','ID_LAST_MODIFY','en','Last Modify','2014-01-15') , +( 'LABEL','ID_LAST_MODIFY','en','Last Modified','2017-02-21') , ( 'LABEL','ID_DELEGATION_DATE','en','Delegation Date','2014-01-15') , ( 'LABEL','ID_DUE_DATE','en','Due Date','2014-01-15') , ( 'LABEL','ID_PRIORITY','en','Priority','2014-01-15') , @@ -3140,7 +3140,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_THANKS_USE_SERVICES','en','Thanks for using the ProcessMaker services','2014-01-15') , ( 'LABEL','ID_RESET_PASSWORD','en','Reset password','2014-01-15') , ( 'LABEL','ID_YOUR_PASSWORD_IS','en','Your password is','2014-01-15') , -( 'LABEL','ID_ENABLE_FOTGOT_PASSWORD','en','Enable Forgot password','2014-01-15') , +( 'LABEL','ID_ENABLE_FOTGOT_PASSWORD','en','Enable Password Recovery','2017-02-21') , ( 'LABEL','ID_NEW_PASSWORD_SENT','en','Your new password was sent to your email account!','2014-01-15') , ( 'LABEL','ID_IS_NOT_REGISTERED','en','is not registered!','2014-01-15') , ( 'LABEL','ID_EMAIL_ENGINE_IS_NOT_ENABLED','en','The "Email Notifications" is not enabled, please contact to your System Administrator.','2014-01-15') , @@ -3397,7 +3397,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SEL_AFTER_DATE','en','Please select after date','2014-01-15') , ( 'LABEL','ID_SEL_BEFORE_DATE','en','Please select before date','2014-01-15') , ( 'LABEL','ID_ASSIGNED_TO','en','Assigned To','2014-01-15') , -( 'LABEL','ID_DASHLETS_INSTANCES','en','Dashlets Instances','2014-01-15') , +( 'LABEL','ID_DASHLETS_INSTANCES','en','Dashlet Instances','2017-02-21') , ( 'LABEL','ID_INPUT_DOC_DOESNT_EXIST','en','Input Document does not exist!','2014-01-15') , ( 'JAVASCRIPT','ID_INTERMEDIATE_TIMER_EVENT','en','Intermediate timer','2014-01-15') , ( 'LABEL','ID_TEMPLATE_FILE_NOT_EXIST','en','Template file ''{FILE_TEMPLATE}'' does not exist.','2014-01-15') , @@ -3590,7 +3590,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PASSWORD_CURRENT','en','Current Password','2014-01-15') , ( 'LABEL','ID_PASSWORD_CURRENT_ENTER','en','Enter the current password','2014-01-15') , ( 'LABEL','ID_PASSWORD_CURRENT_INCORRECT','en','The current password is incorrect','2014-01-15') , -( 'LABEL','ID_MAX_LIFETIME','en','Cookie lifetime (seconds)','2014-09-02') , +( 'LABEL','ID_MAX_LIFETIME','en','Cookie Lifetime (Seconds)','2017-02-21') , ( 'LABEL','ID_SUCCESSFUL_CONNECTION','en','Successful connection','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_SUCCESS_INSTALLED','en','ProcessMaker was successfully installed
Workspace " {0} " was installed correctly.','2014-01-15') , ( 'LABEL','ID_CONNECTION_ERROR','en','Connection Error: {0}','2014-01-15') , @@ -3818,7 +3818,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_NAME_TAS_TITLE_REQUIRE','en','Task title required','2014-01-15') , ( 'LABEL','APP_TITLE_CASE_LABEL_UPDATE','en','The system has detected that changes to the case labels will affect more than 1000 records, so the changes will be performed by cron the next time it is scheduled to run.','2015-01-16') , -( 'LABEL','ID_MESSAGE_LOGIN','en','The default language set here is for the \"Language\" dropdown box displayed on the login screen. This configuration is set for each workspace.','2015-01-20') , +( 'LABEL','ID_MESSAGE_LOGIN','en','The default language set here is for the Language dropdown box displayed on the login screen. This configuration is set for each workspace.','2017-02-21') , ( 'LABEL','ID_MESSAGE_SYSTEM','en','The language that is set by default applies directly when the domain is entered (eg.- http://127.0.0.1:8081), the system reads the configuration and redirects the link to the selected language','2014-01-15') , ( 'LABEL','ID_MESSAGE_SYSTEM2','en','(eg.- http://127.0.0.1:8081/sys/en/classic/login/login), it should be emphasized that this configuration is for all environments.','2014-01-15') , ( 'LABEL','ID_PROCESSMAP_SEQUENTIAL','en','Sequential','2014-01-15') , @@ -3912,12 +3912,12 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TASK_NOT_RELATED','en','[Not related to a task]','2014-01-15') , ( 'LABEL','ID_GRID_PAGE_DISPLAYING_EMAIL_MESSAGE','en','Displaying emails {0} - {1} of {2}','2014-01-15') , ( 'LABEL','ID_GRID_PAGE_NO_EMAIL_MESSAGE','en','No Emails to display','2014-01-15') , -( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_CHECK','en','Check PM requirements','2014-01-15') , +( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_CHECK','en','Check PM Requirements','2017-02-21') , ( 'LABEL','ID_PHP_INFO','en','PHP Information','2014-01-15') , ( 'LABEL','ID_CHECKING','en','Checking...','2014-01-15') , ( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') , -( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.
','2015-04-07') , -( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!
','2015-01-16') , +( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as \" No\"), then please take actions to correct them.
','2017-01-21') , +( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so correctly could lead to your ProcessMaker installation not functioning correctly!
','2017-02-21') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP recommended version 5.6 or higher (7.0 not supported)','2016-06-29') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MSSQL','en','MSSQL Support (*)','2014-01-15') , @@ -3936,7 +3936,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CASESLIST_FIELD_COMPLETE','en','Complete all system fields','2014-01-15') , ( 'LABEL','ID_CASESLIST_FIELD_COMPLETE_ID','en','Complete all system fields with the label ID for its translation','2015-01-16') , ( 'LABEL','ID_CASESLIST_FIELD_LABEL_RESET','en','Restart labels with system fields','2014-01-15') , -( 'LABEL','ID_CASESLIST_FIELD_LABEL_RESET_ID','en','Restart labels with system fields with the labels ID for its translation','2015-01-16') , +( 'LABEL','ID_CASESLIST_FIELD_LABEL_RESET_ID','en','Restart labels with system fields with the ID of the label for its translation','2017-02-21') , ( 'LABEL','ID_SKIN_TEAM','en','ProcessMaker Team','2014-01-15') , ( 'LABEL','ID_CREATED','en','Created','2014-01-15') , ( 'LABEL','ID_PREVIOUS_YEAR','en','Previous Year','2014-01-15') , @@ -3984,7 +3984,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_REQUIRED_NAME_CASE_SCHEDULER','en','You forgot the name of the Case Scheduler','2014-01-15') , ( 'LABEL','ID_DUPLICATE_CASE_SCHEDULER_NAME','en','Duplicate Case Scheduler name.','2014-01-15') , ( 'LABEL','ID_MSG_CLEAR_GRID_FIRST_ITEM','en','Do you want to clear the information from the first row?','2014-01-15') , -( 'LABEL','ID_FROM_NAME','en','From name','2014-01-15') , +( 'LABEL','ID_FROM_NAME','en','Sender Name','2017-02-21') , ( 'LABEL','ID_ACCEPT','en','Accept','2014-01-15') , ( 'LABEL','ID_ERROR_SEND_NOTIFICATIONS','en','The following error has occurred when trying to send the notifications:','2014-01-15') , ( 'LABEL','ID_DATE_FORMAT_17','en','dd de M de Y (Date format only for Spanish language)','2015-03-17') , @@ -4066,7 +4066,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_EVENT_ADD_GROUP','en','Add groups','2014-02-12') , ( 'LABEL','ID_EXECUTION','en','Execution','2014-02-12') , ( 'LABEL','ID_GROUP_CANNOT_DELETE_WHILE_ASSIGNED_TO_TASK','en','Group cannot be deleted while it''s assigned to a task','2014-04-03') , -( 'LABEL','ID_FROM_EMAIL','en','From Mail','2014-04-30') , +( 'LABEL','ID_FROM_EMAIL','en','Sender Email','2017-02-21') , ( 'LABEL','ID_UNSAVED_TRIGGERS_WINDOW','en','You have unsaved changes in popup! If you leave the page all the windows will be closed.','2014-10-21') , ( 'LABEL','ID_INSTALL_USE_CURRENT_USER','en','The MySQL user from the previous step will be the database owner. (Do not create a new user.)','2015-03-05') , ( 'LABEL','ID_ACCOUNT_OPTIONS','en','Account Options','2014-05-16') , @@ -4284,7 +4284,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ERROR_UPLOADING_PLUGIN','en','Error uploading the plugin','2014-09-18') , ( 'LABEL','ID_CURRENT_VERSION','en','Current version','2014-09-18') , ( 'LABEL','ID_NO_NEW_VERSIONS','en','No new versions available','2014-09-18') , -( 'LABEL','ID_CHECK_UPDATES','en','Check for updates (you need to be connected to Internet)','2014-09-18') , +( 'LABEL','ID_CHECK_UPDATES','en','Check for updates (you need to be connected to the Internet)','2017-02-21') , ( 'LABEL','ID_YOUR_LICENSE','en','Your license','2014-09-18') , ( 'LABEL','ID_CURRENT_LICENSE','en','Current license','2014-09-18') , ( 'LABEL','ID_LICENSE_SERVER','en','License server','2014-09-18') , @@ -4327,8 +4327,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_ENABLE_AUDIT_LOG','en','Enable Audit Log','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_ENABLED','en','Audit Log has been enabled','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_DISABLED','en','Audit Log has been disabled','2014-09-19') , -( 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','When this option is enabled, all changes made in the "ADMIN" tab are registered in a log.','2014-09-30') , -( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','and the user will be able to see those changes in the "Audit Log" option in Logs Menu','2014-10-10') , +( 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','When this option is enabled, all changes made in the Admin tab are registered in a log.','2017-02-21') , +( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','and the user will be able to see those changes in the Audit Log option in Logs Menu','2017-02-21') , ( 'LABEL','ID_PRIVATE','en','Private','2014-09-22') , ( 'LABEL','ID_CASES_LIST','en','Cases Lists','2015-04-28') , ( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') , @@ -4420,7 +4420,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_UPDATE_ENVIRONMENT_SETTINGS','en','Update Environment Settings','2014-10-13') , ( 'LABEL','ID_NAME_EXISTS','en','The name exists','2014-10-15') , ( 'LABEL','ID_MCRYPT_SUPPORT','en','Mcrypt Support','2014-10-17') , -( 'LABEL','ID_GENERATE_INFO_SUPPORT','en','A file with the information of your System will be generated. It will help the support team to provide a better support to any issue that may appear','2014-10-22') , +( 'LABEL','ID_GENERATE_INFO_SUPPORT','en','A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur.','2017-02-21') , ( 'LABEL','ID_CURRENT_BROWSER_NOT_SUPPORTED','en','Your browser is not supported. See the list of supported browsers. List of supported browsers is a link to the wiki page: http://wiki.processmaker.com/3.0/Supported_Browsers','2014-10-22') , ( 'LABEL','ID_PMTABLES_CANT_EXPORT','en','There are no tables to export.','2014-10-22') , ( 'LABEL','ID_SUPPORT','en','Support','2014-10-20') , @@ -4463,7 +4463,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_EMAIL_SERVER_CONFIRM_DELETE','en','Do you want to delete the Email Server?','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_PORT','en','Port','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_DEFAULT','en','Default','2014-12-24') , -( 'LABEL','ID_EMAIL_SERVER_ACCOUNT_FROM','en','Account From','2014-12-24') , +( 'LABEL','ID_EMAIL_SERVER_ACCOUNT_FROM','en','Sender Account','2017-02-21') , ( 'LABEL','ID_EMAIL_SERVER_TEST_CONNECTION_VERIFYING_MAIL','en','Verifying Mail Transport Agent','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_TEST_CONNECTION_RESOLVING_NAME','en','Resolving Host Name: {0}','2014-12-24') , ( 'LABEL','ID_EMAIL_SERVER_TEST_CONNECTION_CHECK_PORT','en','Checking port: {0}','2014-12-24') , @@ -4652,7 +4652,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DELETE_CASE_NO_STATUS','en','You can''t delete the case because it''s not in Draft status and was already derivated.','2015-04-27') , ( 'LABEL','ID_DELETE_CASE_NO_OWNER','en','You can''t delete the case because you didn''t create the case.','2015-04-27') , ( 'LABEL','ID_SORT_BY','en','Sort by','2015-04-28') , -( 'LABEL','ID_CUSTOM_CASES_LISTS','en','Custom Cases Lists','2015-04-29') , +( 'LABEL','ID_CUSTOM_CASES_LISTS','en','Custom Case List','2017-02-21') , ( 'LABEL','ID_NO_INEFFICIENT_PROCESSES','en','No Inefficient Processes','2015-04-29') , ( 'LABEL','ID_NO_INEFFICIENT_TASKS','en','No Inefficient Tasks','2015-04-29') , ( 'LABEL','ID_NO_INEFFICIENT_USER_GROUPS','en','No Inefficient User Groups','2015-04-29') , @@ -5286,7 +5286,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_1c0b8f236cc7ad13254af9a32ea15be8','en','Resend','2016-08-12') , ( 'LABEL','ID_MAFE_336816fd752e17593553eda4894e8464','en','Create permission','2016-08-12') , ( 'LABEL','ID_MAFE_245a41b3d20ec98d1e045e149f645911','en','Edit permission','2016-08-12') , -( 'LABEL','ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056','en','Status Case','2016-08-12') , +( 'LABEL','ID_MAFE_3901de5bd75f430a8ce0bed0f2f90056','en','Case Status','2014-02-21') , ( 'LABEL','ID_MAFE_521019040a0f4f7773357aa6bc22180b','en','DRAFT','2016-08-12') , ( 'LABEL','ID_MAFE_fa3c608c8fc755543f0d37afd6a42651','en','TO DO','2016-08-12') , ( 'LABEL','ID_MAFE_99b2439e63f73ad515f7ab2447a80673','en','PAUSED','2016-08-12') ; @@ -5884,7 +5884,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_fb8e567d9b10447761969e1e08eebc2b','en','Create','2016-08-12') , ( 'LABEL','ID_MAFE_585db2c92dc89eef837f07b5791c5536','en','Edit','2016-08-12') , ( 'LABEL','ID_MAFE_b79a5b8ee43aa9dc939723becd94a8c0','en','Please enter a numeric value','2016-08-12') , -( 'LABEL','ID_MAFE_42b5e40c0f14c557113865a3aa78b673','en','Insert a SQL query like: SELECT [Key field], [Label field] FROM [Table name]','2016-08-12') , +( 'LABEL','ID_MAFE_42b5e40c0f14c557113865a3aa78b673','en','Insert an SQL query like: SELECT [Key field], [Label field] FROM [Table name]','2017-02-21') , ( 'LABEL','ID_MAFE_6b66a61fa66288a9a7ad6474d2e686ec','en','Default Value','2016-04-08') , ( 'LABEL','ID_MAFE_57c095deeaf026f8022c485e054135c7','en','Are you sure you want to delete the "variable"?','2016-08-12') , ( 'LABEL','ID_MAFE_308465ce385e7fe39ed79f3b9f2c4dee','en','Store value in','2016-08-12') , @@ -6015,9 +6015,9 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_99493c187e709deb387b6ee3ec6c8179','en','The input document is required, please select the value.','2016-08-12') , ( 'LABEL','ID_GOOGLEINTEGRATION','en','Google Integration','2016-01-05') , ( 'LABEL','ID_PMGMAIL_DISABLE','en','Are you sure to disable the Gmail Integration? If you do this, all the mails and relabelling sent to Gmail will be disabled.','2016-01-05') , -( 'LABEL','ID_PMDRIVE_DISABLE','en','Are you sure to disable the Google Drive Integration? If you do this, the input, output and file documents will be stored only in your ProcessMaker server.','2016-01-05') , -( 'LABEL','ID_GMAIL_HELP_ENABLE','en','Enabling this option, users will be able to use the Gmail extension that allows to interact with Processamaker from the urser''s Gmail web page.','2016-01-05') , -( 'LABEL','ID_DRIVE_HELP_ENABLE','en','Enabling this option will allow to store all input, output and attached documents generated in your processes in Google Drive.','2016-01-05') , +( 'LABEL','ID_PMDRIVE_DISABLE','en','Are you sure to disable the Google Drive Integration? If you do this, the input, output and file documents will be stored only in your ProcessMaker server.','2017-02-21') , +( 'LABEL','ID_GMAIL_HELP_ENABLE','en','When this option is enabled, users will be able to use the Gmail extension that allows interaction with ProcessMaker from the user''s Gmail web page.','2017-02-21') , +( 'LABEL','ID_DRIVE_HELP_ENABLE','en','When this option is enabled, all input, output and attached documents generated in your processes can be stored in Google Drive.','2016-01-05') , ( 'LABEL','ID_ENABLE_PMDRIVE','en','Enable Google Drive.','2016-01-05') , ( 'LABEL','ID_GOOGLE_CERTIFICATE_ERROR','en','Google''s JSON account certificate does not exist. Please contact the system administrator.','2016-01-05') , ( 'LABEL','ID_ACTIONS_BY_EMAIL_LOG','en','Actions By Email Log','2016-01-12') , @@ -6117,7 +6117,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_EXTERNAL_REGISTRATION','en','External Registration','2016-07-01') , ( 'LABEL','ID_FILTER_BY','en','Filter By','2016-07-01') , ( 'LABEL','ID_MAFE_cae0206c31eaa305dd0e847330c5e837','en','wildcard','2016-08-12') , -( 'LABEL','ID_MAFE_8efa191bcfbd509f1be06c9eac30cb9c','en','Fields marked with asterisk (%%ASTERISK%%) are required.','2016-08-12') , +( 'LABEL','ID_MAFE_8efa191bcfbd509f1be06c9eac30cb9c','en','Fields marked with an asterisk (%%ASTERISK%%) are required.','2017-02-21') , ( 'LABEL','ID_MAFE_c7f8f8652db6d74e086d297129179d2f','en','Task/sub-process name can''t be empty','2016-08-12') , ( 'LABEL','ID_EMAIL_EVENT_CONFIGURATION_EMAIL','en','Email event: {0}, in process: {1}, cannot send any mail because its configuration needs to be completed.','2016-07-04') , ( 'LABEL','ID_CANNOT_REMOVE_TEMPLATE_EMAIL_EVENT','en','You can not delete the template {0} because it has a relationship with Email Event','2016-07-05') , @@ -6159,7 +6159,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_4e357e7345689cff230335282b201a11','en','Enable camera','2016-08-12') , ( 'LABEL','ID_MAFE_5582ead0a9ee86a54da29c20caee6f57','en','Force user login','2016-08-12') , ( 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12') , -( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default user expiry date (years)','2016-08-12') ; +( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From de6f306bc837552fd5f59ba288bf227117bc6437 Mon Sep 17 00:00:00 2001 From: Dante Date: Tue, 21 Feb 2017 15:32:32 -0400 Subject: [PATCH 07/17] HOR-2737 --- .../engine/classes/class.dashletProcessMakerCommunity.php | 4 ++-- .../templates/dashboard/dashletProcessMakerEnterprisePm3.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.dashletProcessMakerCommunity.php b/workflow/engine/classes/class.dashletProcessMakerCommunity.php index 7350dc2be..459a4a849 100644 --- a/workflow/engine/classes/class.dashletProcessMakerCommunity.php +++ b/workflow/engine/classes/class.dashletProcessMakerCommunity.php @@ -103,7 +103,7 @@ class dashletProcessMakerCommunity implements DashletInterface
FORUM - http://forum.processmaker.com
- Discuss Processker issues, interact with the PMOS community, and get support from fellow developers and community members in the ProcessMaker Forum. + Discuss ProcessMaker issues, interact with the PMOS community, and get support from fellow developers and community members in the ProcessMaker Forum.
@@ -139,4 +139,4 @@ class dashletProcessMakerCommunity implements DashletInterface echo $html; } -} \ No newline at end of file +} diff --git a/workflow/engine/templates/dashboard/dashletProcessMakerEnterprisePm3.html b/workflow/engine/templates/dashboard/dashletProcessMakerEnterprisePm3.html index 74404da29..3ee71fc02 100644 --- a/workflow/engine/templates/dashboard/dashletProcessMakerEnterprisePm3.html +++ b/workflow/engine/templates/dashboard/dashletProcessMakerEnterprisePm3.html @@ -32,7 +32,7 @@

Business Rules Engine

- Allows companies to develop business rules outside of their processes making it much easier to develop and maintain complex business logic. This level of abstraction allows process designers to assign business rule maintenance tasks to an analyst that only needs to understand the logic of the business rules and does not need to have a deep understanding of the entire business process. + Allows companies to develop business rules outside of their processes, making it much easier to develop and maintain complex business logic. This level of abstraction allows process designers to assign business rule maintenance tasks to an analyst that only needs to understand the logic of the business rules and does not need to have a deep understanding of the entire business process.
Read More»

@@ -203,4 +203,4 @@ - \ No newline at end of file + From 75af3c8fc201b85bb83ed8191a44b1fa4beab30a Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 21 Feb 2017 16:16:44 -0400 Subject: [PATCH 08/17] Delete * in translation --- .../engine/content/translations/english/processmaker.en.po | 4 ++-- workflow/engine/data/mysql/insert.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index fbfd252b8..82d77b67a 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -17494,8 +17494,8 @@ msgstr "Mcrypt Support" # TRANSLATION # LABEL/ID_GENERATE_INFO_SUPPORT #: LABEL/ID_GENERATE_INFO_SUPPORT -msgid "A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur." -msgstr "A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur." +msgid "A file with information about your System will be generated. It will help the support team provide better support for any issue that may occur." +msgstr "A file with information about your System will be generated. It will help the support team provide better support for any issue that may occur." # TRANSLATION # LABEL/ID_CURRENT_BROWSER_NOT_SUPPORTED diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 888c9d980..b7f3c88ce 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4420,7 +4420,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_UPDATE_ENVIRONMENT_SETTINGS','en','Update Environment Settings','2014-10-13') , ( 'LABEL','ID_NAME_EXISTS','en','The name exists','2014-10-15') , ( 'LABEL','ID_MCRYPT_SUPPORT','en','Mcrypt Support','2014-10-17') , -( 'LABEL','ID_GENERATE_INFO_SUPPORT','en','A file with information* about *your System will be generated. It will help the support team provide better support for any issue that may occur.','2017-02-21') , +( 'LABEL','ID_GENERATE_INFO_SUPPORT','en','A file with information about your System will be generated. It will help the support team provide better support for any issue that may occur.','2017-02-21') , ( 'LABEL','ID_CURRENT_BROWSER_NOT_SUPPORTED','en','Your browser is not supported. See the list of supported browsers. List of supported browsers is a link to the wiki page: http://wiki.processmaker.com/3.0/Supported_Browsers','2014-10-22') , ( 'LABEL','ID_PMTABLES_CANT_EXPORT','en','There are no tables to export.','2014-10-22') , ( 'LABEL','ID_SUPPORT','en','Support','2014-10-20') , From f23261fa5e5b345bb299c770c6f326fc78c511de Mon Sep 17 00:00:00 2001 From: Dante Date: Wed, 22 Feb 2017 12:04:12 -0400 Subject: [PATCH 09/17] HOR-2754 --- .../translations/english/processmaker.en.po | 25 +++++++++++++++++++ workflow/engine/data/mysql/insert.sql | 6 ++++- .../engine/templates/actionsByEmail/report.js | 18 ++++++------- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 82d77b67a..5e76ceede 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -27719,6 +27719,30 @@ msgstr "Email Account Settings" msgid "Assigned user" msgstr "Assigned user" +# TRANSLATION +# LABEL/ID_CASE_NUMBER_CAPITALIZED +#: LABEL/ID_CASE_NUMBER_CAPITALIZED +msgid "Case Number" +msgstr "Case Number" + +# TRANSLATION +# LABEL/ID_ANSWERED +#: LABEL/ID_ANSWERED +msgid "Answered" +msgstr "Answered" + +# TRANSLATION +# LABEL/ID_VIEW_RESPONSE +#: LABEL/ID_VIEW_RESPONSE +msgid "View Response" +msgstr "View Response" + +# TRANSLATION +# LABEL/ID_ERROR_MESSAGE +#: LABEL/ID_ERROR_MESSAGE +msgid "Error Message" +msgstr "Error Message" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME @@ -50936,3 +50960,4 @@ msgstr "Cancel" #: button - PME_ACCEPT msgid "[dynaforms/fields/yesno.xml?PME_ACCEPT] Save" msgstr "Save" + diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index b7f3c88ce..6ad70d66c 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -6159,7 +6159,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MAFE_4e357e7345689cff230335282b201a11','en','Enable camera','2016-08-12') , ( 'LABEL','ID_MAFE_5582ead0a9ee86a54da29c20caee6f57','en','Force user login','2016-08-12') , ( 'LABEL','ID_MAFE_f82e519e2e82239be5f49d78b24ea228','en','Supported Controls: Multiple File.','2016-08-12') , -( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') ; +( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') , +( 'LABEL','ID_CASE_NUMBER_CAPITALIZED','en','Case Number','2017-02-22') , +( 'LABEL','ID_ANSWERED','en','Answered','2017-02-22') , +( 'LABEL','ID_VIEW_RESPONSE','en','Error message','2017-02-22') , +( 'LABEL','ID_ERROR_MESSAGE','en','View response','2017-02-22') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/templates/actionsByEmail/report.js b/workflow/engine/templates/actionsByEmail/report.js index 543b2baf2..015541e26 100644 --- a/workflow/engine/templates/actionsByEmail/report.js +++ b/workflow/engine/templates/actionsByEmail/report.js @@ -67,15 +67,15 @@ store = new Ext.data.GroupingStore( { }, columns: [ {id: "ABE_UID", dataIndex: "ABE_UID", hidden:true, hideable:false}, - {header: _("ID_DATE").toUpperCase(), width: 100, dataIndex: "ABE_REQ_DATE", sortable: true}, - {header: "Case Number".toUpperCase(), width: 70, dataIndex: "APP_NUMBER", sortable: true}, - {header: _("ID_SUBJECT").toUpperCase(), width: 150, dataIndex: "ABE_REQ_SUBJECT", sortable: true}, - {header: _("ID_FROM").toUpperCase(), width: 110, dataIndex: "USER", sortable: true}, - {header: _("ID_TO").toUpperCase(), width: 110, dataIndex: "ABE_REQ_SENT_TO", sortable: true}, - {header: _("ID_STATUS").toUpperCase(), width: 40, dataIndex: "ABE_REQ_STATUS", sortable: true}, - {header: "Answered".toUpperCase(), width: 60, dataIndex: "ABE_REQ_ANSWERED"}, - {header: "View Response".toUpperCase(), width: 80, sortable: false, align: 'center', renderer: function(val){ return ' Date: Thu, 23 Feb 2017 10:12:53 -0400 Subject: [PATCH 10/17] fixing incorrect texts when inserting into the content table --- workflow/engine/data/mysql/insert.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 6ad70d66c..7f942832e 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -6162,8 +6162,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DEFAULT_EXPIRATION_YEAR','en','Default User Expiry Date (Years)','2017-02-21') , ( 'LABEL','ID_CASE_NUMBER_CAPITALIZED','en','Case Number','2017-02-22') , ( 'LABEL','ID_ANSWERED','en','Answered','2017-02-22') , -( 'LABEL','ID_VIEW_RESPONSE','en','Error message','2017-02-22') , -( 'LABEL','ID_ERROR_MESSAGE','en','View response','2017-02-22') ; +( 'LABEL','ID_VIEW_RESPONSE','en','View Response','2017-02-22') , +( 'LABEL','ID_ERROR_MESSAGE','en','Error Message','2017-02-22') ; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , From b4d16247164cf8a80df71e981b893396504b4e5d Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Thu, 23 Feb 2017 15:01:58 -0400 Subject: [PATCH 11/17] HOR-2783 --- .../methods/processes/processes_doUpload.php | 54 +++-- .../templates/processes/processes_Upload.php | 203 ++++++++---------- 2 files changed, 121 insertions(+), 136 deletions(-) diff --git a/workflow/engine/methods/processes/processes_doUpload.php b/workflow/engine/methods/processes/processes_doUpload.php index 90dc80850..afe1d21ba 100644 --- a/workflow/engine/methods/processes/processes_doUpload.php +++ b/workflow/engine/methods/processes/processes_doUpload.php @@ -1,19 +1,20 @@ userCanAccess('PM_FACTORY') == 1) { - if (isset( $_SESSION['processes_upload'] )) { - $form = $_SESSION['processes_upload']; - G::LoadClass('processes'); - $app = new Processes(); - if (!$app->processExists($form['PRO_UID'])) { - $result = 0; - $msg = G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED'); - echo "{'result': $result, 'msg':'$msg'}"; - die; - } + +sleep(1); +global $RBAC; +if ($RBAC->userCanAccess('PM_FACTORY') == 1) { + if (isset($_SESSION['processes_upload'])) { + $form = $_SESSION['processes_upload']; + G::LoadClass('processes'); + $app = new Processes(); + if (!$app->processExists($form['PRO_UID'])) { + $result = 0; + $msg = G::LoadTranslation('ID_PROCESS_UID_NOT_DEFINED'); + echo "{'result': $result, 'msg':'$msg'}"; + die; + } switch ($form['MAIN_DIRECTORY']) { - case 'mailTemplates': + case 'mailTemplates': $sDirectory = PATH_DATA_MAILTEMPLATES . $form['PRO_UID'] . PATH_SEP . ($form['CURRENT_DIRECTORY'] != '' ? $form['CURRENT_DIRECTORY'] . PATH_SEP : ''); break; case 'public': @@ -22,18 +23,29 @@ if ( $RBAC->userCanAccess('PM_FACTORY') == 1) { default: die(); break; - } + } } - if ($_FILES['form']['error'] == "0") { - G::uploadFile( $_FILES['form']['tmp_name'], $sDirectory, $_FILES['form']['name'] ); - $msg = "Uploaded (" . (round( (filesize( $sDirectory . $_FILES['form']['name'] ) / 1024) * 10 ) / 10) . " kb)"; + $fileName = $_FILES['form']['name']; + $canUploadPhpFile = true; + $extension = pathinfo($fileName, PATHINFO_EXTENSION); + if (\Bootstrap::getDisablePhpUploadExecution() === 1 && $extension === 'php') { + $message = \G::LoadTranslation('THE_UPLOAD_OF_PHP_FILES_WAS_DISABLED'); + \Bootstrap::registerMonologPhpUploadExecution('phpUpload', 550, $message, $fileName); + $canUploadPhpFile = false; + } + + if ($_FILES['form']['error'] == "0" && $canUploadPhpFile) { + G::uploadFile($_FILES['form']['tmp_name'], $sDirectory, $fileName); + $msg = "Uploaded (" . (round((filesize($sDirectory . $fileName) / 1024) * 10) / 10) . " kb)"; $result = 1; - //echo $sDirectory.$_FILES['form']['name']; } else { $msg = "Failed"; + if ($canUploadPhpFile === false) { + $msg = $message; + } $result = 0; } - - echo "{'result': $result, 'msg':'$msg'}"; + + echo "{'result': $result, 'msg':'$msg'}"; } \ No newline at end of file diff --git a/workflow/engine/templates/processes/processes_Upload.php b/workflow/engine/templates/processes/processes_Upload.php index ec3884cb1..1d95ed0ba 100644 --- a/workflow/engine/templates/processes/processes_Upload.php +++ b/workflow/engine/templates/processes/processes_Upload.php @@ -1,123 +1,96 @@ - - - - - - - + + + - - - - - - - - -
-
  • -
    - - - -
     
    -
    -
    • -
    + } + + + + + + + + + +
    +
  • +
    + + + +
     
    +
    +
    • +
    From 41eb7b2f9ae2b58243b087dfccb2262e25abb474 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Thu, 23 Feb 2017 15:14:44 -0400 Subject: [PATCH 12/17] HOR-2773 we need to use G::is_https() for get the protocol change to use G::is_https() --- gulliver/methods/errors/block.php | 2 +- gulliver/methods/errors/error403.php | 2 +- workflow/engine/classes/class.enterpriseUtils.php | 2 +- workflow/engine/classes/model/OutputDocument.php | 2 +- workflow/engine/content/languages/en.js | 0 workflow/engine/content/languages/translation.en | 0 workflow/engine/controllers/adminProxy.php | 2 +- workflow/engine/controllers/installer.php | 2 +- workflow/engine/methods/oauth2/grant.php | 2 +- workflow/engine/skinEngine/base/error404.php | 2 +- workflow/engine/skinEngine/neoclassic/block.php | 2 +- workflow/engine/skinEngine/neoclassic/error404.php | 2 +- .../src/ProcessMaker/BusinessModel/Cases/OutputDocument.php | 2 +- workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php | 4 ++-- 14 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 workflow/engine/content/languages/en.js mode change 100644 => 100755 workflow/engine/content/languages/translation.en diff --git a/gulliver/methods/errors/block.php b/gulliver/methods/errors/block.php index 19b4a3106..05dd1aebe 100644 --- a/gulliver/methods/errors/block.php +++ b/gulliver/methods/errors/block.php @@ -3,7 +3,7 @@ if (function_exists("http_response_code")) { http_response_code(200); } -$http = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") ? "https" : "http"; +$http = G::is_https() ? "https" : "http"; $host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80") ? ":" . $_SERVER["SERVER_PORT"] : ""); $urlLogin = $http . "://" . $host . "/sys/en/neoclassic/login/login"; diff --git a/gulliver/methods/errors/error403.php b/gulliver/methods/errors/error403.php index c47080475..bc91e6f9d 100644 --- a/gulliver/methods/errors/error403.php +++ b/gulliver/methods/errors/error403.php @@ -1,6 +1,6 @@ process(((isset($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media); + $status = $pipeline->process((G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $_SESSION['APPLICATION'] . '/outdocs/' . $sFilename . '.html', $g_media); copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf'); unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf'); unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html'); diff --git a/workflow/engine/content/languages/en.js b/workflow/engine/content/languages/en.js old mode 100644 new mode 100755 diff --git a/workflow/engine/content/languages/translation.en b/workflow/engine/content/languages/translation.en old mode 100644 new mode 100755 diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 8a5f43fdc..df7d0b660 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1368,7 +1368,7 @@ class adminProxy extends HttpProxyController $pmRestClient->delete(); } - $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; + $http = G::is_https() ? 'https' : 'http'; $lang = defined( 'SYS_LANG' ) ? SYS_LANG : 'en'; $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : ''); diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index cef3f595d..dbe1b0572 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -427,7 +427,7 @@ class Installer extends Controller public function forceTogenerateTranslationsFiles ($url) { $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, G::browserCacheFilesUrl((isset($_SERVER["HTTPS"])? (($_SERVER["HTTPS"] != "")? "https://" : "http://") : "http://") . $_SERVER["HTTP_HOST"] . "/js/ext/translation.en.js?r=" . rand(1, 10000))); + curl_setopt($ch, CURLOPT_URL, G::browserCacheFilesUrl(( G::is_https()? "https://" : "http://" ) . $_SERVER["HTTP_HOST"] . "/js/ext/translation.en.js?r=" . rand(1, 10000))); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1); curl_setopt($ch, CURLOPT_TIMEOUT, 60); diff --git a/workflow/engine/methods/oauth2/grant.php b/workflow/engine/methods/oauth2/grant.php index 88e90c138..6d2ab8547 100644 --- a/workflow/engine/methods/oauth2/grant.php +++ b/workflow/engine/methods/oauth2/grant.php @@ -7,7 +7,7 @@ if (! empty($_GET['error'])) { die(); } -$http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; +$http = G::is_https() ? 'https' : 'http'; $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : ''); $endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, SYS_SYS); $code = empty($_GET['code']) ? 'NN' : $_GET['code']; diff --git a/workflow/engine/skinEngine/base/error404.php b/workflow/engine/skinEngine/base/error404.php index c34ca9902..2bf587d83 100644 --- a/workflow/engine/skinEngine/base/error404.php +++ b/workflow/engine/skinEngine/base/error404.php @@ -1,6 +1,6 @@ process(((isset($_SERVER['HTTPS'])) && ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $sApplication . '/outdocs/' . $sFilename . '.html', $g_media); + $status = $pipeline->process((\G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/files/' . $sApplication . '/outdocs/' . $sFilename . '.html', $g_media); copy(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf', $sPath . $sFilename . '.pdf'); unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.pdf'); unlink(PATH_OUTPUT_FILE_DIRECTORY . $sFilename . '.html'); diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php index 8a2f47d45..4e1563fc9 100644 --- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php +++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php @@ -147,7 +147,7 @@ class Server implements iAuthenticate public function index() { - $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; + $http = \G::is_https() ? 'https' : 'http'; $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : ''); $host = $http .'://'. $host; @@ -183,7 +183,7 @@ class Server implements iAuthenticate session_start(); if (! isset($_SESSION['USER_LOGGED'])) { - $http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http'; + $http = \G::is_https() ? 'https' : 'http'; $host = $http . '://' . $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : ''); $redirect = urlencode($host.'/'.self::$workspace.$_SERVER['REQUEST_URI']); From b83035db670c953f99f096ab71226274a79cd326 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 23 Feb 2017 15:02:41 -0400 Subject: [PATCH 13/17] HOR-2779 --- .../src/ProcessMaker/BusinessModel/Cases.php | 27 ++++++++++++++ .../src/ProcessMaker/BusinessModel/Light.php | 37 +++++++------------ .../src/ProcessMaker/Services/Api/Light.php | 3 +- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 986069f88..e448ffc1f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -3302,4 +3302,31 @@ class Cases return $arrayAccess; } + /** + * Get index last participation from a user + * + * This function return the last participation + * by default is not considered the status OPEN or CLOSED + * in parallel cases return the first to find + * @param string $appUid + * @param string $userUid + * @param string $threadStatus + * @return integer delIndex + */ + public function getLastParticipatedByUser($appUid, $userUid, $threadStatus = '') + { + $criteria = new \Criteria('workflow'); + $criteria->addSelectColumn(\ListParticipatedLastPeer::DEL_INDEX); + $criteria->addSelectColumn(\ListParticipatedLastPeer::DEL_THREAD_STATUS); + $criteria->add(\ListParticipatedLastPeer::APP_UID, $appUid, \Criteria::EQUAL); + $criteria->add(\ListParticipatedLastPeer::USR_UID, $userUid, \Criteria::EQUAL); + if (!empty($threadStatus)) { + $criteria->add(\ListParticipatedLastPeer::DEL_THREAD_STATUS, $threadStatus, \Criteria::EQUAL); + } + $dataSet = \ListParticipatedLastPeer::doSelectRS($criteria); + $dataSet->setFetchmode(\ResultSet::FETCHMODE_ASSOC); + $dataSet->next(); + $row = $dataSet->getRow(); + return isset($row['DEL_INDEX']) ? $row['DEL_INDEX'] : 0; + } } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index d33c85488..daee127f1 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -825,7 +825,17 @@ class Light case 'participated': $oCase = new \Cases(); $iDelIndex = $oCase->getCurrentDelegationCase( $app_uid ); - $aFields = $oCase->loadCase( $app_uid, $iDelIndex ); + $aFields = $oCase->loadCase($app_uid, $iDelIndex); + $response = $this->getInfoResume($userUid, $aFields, $type); + break; + case 'lastopenindex': + //Get the last participate from a user + $oNewCase = new \ProcessMaker\BusinessModel\Cases(); + $iDelIndex = $oNewCase->getLastParticipatedByUser($app_uid, $userUid, 'OPEN'); + $oCase = new \Cases(); + $aFields = $oCase->loadCase($app_uid, $iDelIndex); + $aFields['DEL_INDEX'] = $iDelIndex === 0 ? '' : $iDelIndex; + $aFields['USR_UID'] = $userUid; $response = $this->getInfoResume($userUid, $aFields, $type); break; } @@ -842,23 +852,8 @@ class Light */ public function getInfoResume($userUid, $Fields, $type) { - //print_r($Fields);die; - /* Includes */ - G::LoadClass( 'case' ); /* Prepare page before to show */ - //$oCase = new \Cases(); - -// $participated = $oCase->userParticipatedInCase( $Fields['APP_UID'], $userUid ); -// if ($RBAC->userCanAccess( 'PM_ALLCASES' ) < 0 && $participated == 0) { -// /*if (strtoupper($Fields['APP_STATUS']) != 'COMPLETED') { -// $oCase->thisIsTheCurrentUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'], 'SHOW_MESSAGE'); -// }*/ -// $aMessage['MESSAGE'] = G::LoadTranslation( 'ID_NO_PERMISSION_NO_PARTICIPATED' ); -// $G_PUBLISH = new Publisher(); -// $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); -// G::RenderPage( 'publishBlank', 'blank' ); -// die(); -// } + G::LoadClass( 'case' ); $objProc = new \Process(); $aProc = $objProc->load( $Fields['PRO_UID'] ); @@ -876,15 +871,11 @@ class Light } $Fields['TAS_TITLE'] = implode(" - ", array_values($Fields['TAS_TITLE'])); - } else { - $aTask = $objTask->load( $Fields['TAS_UID'] ); + } elseif (isset($Fields['TAS_UID']) && !empty($Fields['TAS_UID'])) { + $aTask = $objTask->load($Fields['TAS_UID']); $Fields['TAS_TITLE'] = $aTask['TAS_TITLE']; } -// require_once(PATH_GULLIVER .'../thirdparty/smarty/libs/Smarty.class.php'); -// $G_PUBLISH = new \Publisher(); -// $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' ); -// $G_PUBLISH->RenderContent(); return $Fields; } diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light.php b/workflow/engine/src/ProcessMaker/Services/Api/Light.php index 32757d56a..37ab326a2 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Light.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Light.php @@ -1237,7 +1237,8 @@ class Light extends Api 'CREATE_DATE' => 'caseCreateDate', 'UPDATE_DATE' => 'caseUpdateData', 'DESCRIPTION' => 'caseDescription', - 'PRO_UID' => 'processId' + 'PRO_UID' => 'processId', + 'DEL_INDEX' => 'delIndex' ), 'task' => array( 'TAS_TITLE' => 'taskTitle', From d8816014f73ef3d644916554787dd3817e851713 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Thu, 23 Feb 2017 15:34:23 -0400 Subject: [PATCH 14/17] Remove files no changes --- workflow/engine/content/languages/en.js | 0 workflow/engine/content/languages/translation.en | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 workflow/engine/content/languages/en.js mode change 100755 => 100644 workflow/engine/content/languages/translation.en diff --git a/workflow/engine/content/languages/en.js b/workflow/engine/content/languages/en.js old mode 100755 new mode 100644 diff --git a/workflow/engine/content/languages/translation.en b/workflow/engine/content/languages/translation.en old mode 100755 new mode 100644 From 8ded07f10bf9891764691ab55306d78b9fc06e21 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Thu, 23 Feb 2017 17:00:48 -0400 Subject: [PATCH 15/17] Code style --- workflow/engine/classes/class.enterpriseUtils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/classes/class.enterpriseUtils.php b/workflow/engine/classes/class.enterpriseUtils.php index 3188419cd..2c7aceca8 100644 --- a/workflow/engine/classes/class.enterpriseUtils.php +++ b/workflow/engine/classes/class.enterpriseUtils.php @@ -113,7 +113,7 @@ class EnterpriseUtils public static function getUrlServerName() { - $s = (G::is_https()? "s" : null); + $s = (G::is_https() ? "s" : null); $p = strtolower($_SERVER["SERVER_PROTOCOL"]); $protocol = substr($p, 0, strpos($p, "/")) . $s; From a4206c030f536672e5400020746b944e2a8c6ab6 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Thu, 23 Feb 2017 18:26:32 -0400 Subject: [PATCH 16/17] I changed the source for data --- .../engine/src/ProcessMaker/BusinessModel/Cases.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index e448ffc1f..c9cfc19d2 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -3316,14 +3316,14 @@ class Cases public function getLastParticipatedByUser($appUid, $userUid, $threadStatus = '') { $criteria = new \Criteria('workflow'); - $criteria->addSelectColumn(\ListParticipatedLastPeer::DEL_INDEX); - $criteria->addSelectColumn(\ListParticipatedLastPeer::DEL_THREAD_STATUS); - $criteria->add(\ListParticipatedLastPeer::APP_UID, $appUid, \Criteria::EQUAL); - $criteria->add(\ListParticipatedLastPeer::USR_UID, $userUid, \Criteria::EQUAL); + $criteria->addSelectColumn(\AppDelegationPeer::DEL_INDEX); + $criteria->addSelectColumn(\AppDelegationPeer::DEL_THREAD_STATUS); + $criteria->add(\AppDelegationPeer::APP_UID, $appUid, \Criteria::EQUAL); + $criteria->add(\AppDelegationPeer::USR_UID, $userUid, \Criteria::EQUAL); if (!empty($threadStatus)) { - $criteria->add(\ListParticipatedLastPeer::DEL_THREAD_STATUS, $threadStatus, \Criteria::EQUAL); + $criteria->add(\AppDelegationPeer::DEL_THREAD_STATUS, $threadStatus, \Criteria::EQUAL); } - $dataSet = \ListParticipatedLastPeer::doSelectRS($criteria); + $dataSet = \AppDelegationPeer::doSelectRS($criteria); $dataSet->setFetchmode(\ResultSet::FETCHMODE_ASSOC); $dataSet->next(); $row = $dataSet->getRow(); From bbfb22e44e0000046c523347d7c5fe67a4dae098 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Fri, 24 Feb 2017 11:13:23 -0400 Subject: [PATCH 17/17] HOR-2789 Audit Log translation change label --- .../engine/content/translations/english/processmaker.en.po | 4 ++-- workflow/engine/data/mysql/insert.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 5e76ceede..2e27c63fb 100644 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -16954,8 +16954,8 @@ msgstr "When this option is enabled, all changes made in the Admin tab are regis # TRANSLATION # LABEL/ID_AUDIT_LOG_DETAILS_2 #: LABEL/ID_AUDIT_LOG_DETAILS_2 -msgid "and the user will be able to see those changes in the Audit Log option in Logs Menu" -msgstr "and the user will be able to see those changes in the Audit Log option in Logs Menu" +msgid "The user will be able to see those changes in the Audit Log option in the Logs menu." +msgstr "The user will be able to see those changes in the Audit Log option in the Logs menu." # TRANSLATION # LABEL/ID_PRIVATE diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 7f942832e..616f3f1a6 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -4328,7 +4328,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_AUDIT_LOG_ENABLED','en','Audit Log has been enabled','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_DISABLED','en','Audit Log has been disabled','2014-09-19') , ( 'LABEL','ID_AUDIT_LOG_DETAILS_1','en','When this option is enabled, all changes made in the Admin tab are registered in a log.','2017-02-21') , -( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','and the user will be able to see those changes in the Audit Log option in Logs Menu','2017-02-21') , +( 'LABEL','ID_AUDIT_LOG_DETAILS_2','en','The user will be able to see those changes in the Audit Log option in the Logs menu.','2017-02-21') , ( 'LABEL','ID_PRIVATE','en','Private','2014-09-22') , ( 'LABEL','ID_CASES_LIST','en','Cases Lists','2015-04-28') , ( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') ,