From 478f84a42494f46ab8342385fd0085673f3d3719 Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Thu, 15 Apr 2021 13:03:15 -0400 Subject: [PATCH] PMCORE-2975 Review the WARNING in the file workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php --- gulliver/system/class.menu.php | 2 +- .../src/ProcessMaker/BusinessModel/CaseScheduler.php | 12 ++++++------ .../ProcessMaker/Policies/ControlUnderUpdating.php | 2 +- workflow/public_html/sysGeneric.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gulliver/system/class.menu.php b/gulliver/system/class.menu.php index ca27dbfb5..c8b992771 100644 --- a/gulliver/system/class.menu.php +++ b/gulliver/system/class.menu.php @@ -131,7 +131,7 @@ class Menu $this->Types[$c] = $G_TMP_MENU->Types[$i]; $this->Enabled[$c] = $G_TMP_MENU->Enabled[$i]; $this->Id[$c] = $G_TMP_MENU->Id[$i]; - $this->Classes[$c] = $G_TMP_MENU->Classes[$i]; + $this->Classes[$c] = isset($G_TMP_MENU->Classes[$i]) ? $G_TMP_MENU->Classes[$i] : null; $this->ElementClass[$c] = (isset($G_TMP_MENU->ElementClass[$i]))? $G_TMP_MENU->ElementClass[$i] : ""; $c++; } else { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php index e43a1e6fb..038fd8fa6 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php @@ -379,19 +379,19 @@ class CaseScheduler throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_start_day_opt_2'))); } $caseSchedulerData['SCH_START_DAY'] = $nStartDay . '|' . $caseSchedulerData['SCH_START_DAY_OPT_2']; - $optionTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{0}; + $optionTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][0]; if ($optionTwo == "1" || $optionTwo == "2" || $optionTwo == "3" || $optionTwo == "4" || $optionTwo == "5") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('sch_start_day_opt_2'))); } - $pipelineTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{1}; + $pipelineTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][1]; if ($pipelineTwo == "|") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('sch_start_day_opt_2'))); } - $dayTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{2}; + $dayTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][2]; if ($dayTwo == "1" || $dayTwo == "2" || $dayTwo == "3" || $dayTwo == "4" || $dayTwo == "5" || $dayTwo == "6" || $dayTwo == "7") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { @@ -669,19 +669,19 @@ class CaseScheduler throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_NULL", array('sch_start_day_opt_2'))); } $caseSchedulerData['SCH_START_DAY'] = $nStartDay . '|' . $caseSchedulerData['SCH_START_DAY_OPT_2']; - $optionTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{0}; + $optionTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][0]; if ($optionTwo == "1" || $optionTwo == "2" || $optionTwo == "3" || $optionTwo == "4" || $optionTwo == "5") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('sch_start_day_opt_2'))); } - $pipelineTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{1}; + $pipelineTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][1]; if ($pipelineTwo == "|") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('sch_start_day_opt_2'))); } - $dayTwo = $caseSchedulerData['SCH_START_DAY_OPT_2']{2}; + $dayTwo = $caseSchedulerData['SCH_START_DAY_OPT_2'][2]; if ($dayTwo == "1" || $dayTwo == "2" || $dayTwo == "3" || $dayTwo == "4" || $dayTwo == "5" || $dayTwo == "6" || $dayTwo == "7") { $caseSchedulerData['SCH_START_DAY_OPT_2'] = $caseSchedulerData['SCH_START_DAY_OPT_2']; } else { diff --git a/workflow/engine/src/ProcessMaker/Policies/ControlUnderUpdating.php b/workflow/engine/src/ProcessMaker/Policies/ControlUnderUpdating.php index c40363912..0d4810f0b 100644 --- a/workflow/engine/src/ProcessMaker/Policies/ControlUnderUpdating.php +++ b/workflow/engine/src/ProcessMaker/Policies/ControlUnderUpdating.php @@ -48,7 +48,7 @@ class ControlUnderUpdating implements iAuthenticate public static function verifyUnderUpgrading() { $underUpdating = \Bootstrap::isPMUnderUpdating(); - if ($underUpdating['action']) { + if (isset($underUpdating['action']) && $underUpdating['action']) { $sysTemp = true; if (defined('SYS_TEMP')) { $sysTemp = $underUpdating['workspace'] == SYS_TEMP; diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index ee8371fbc..1aa362f65 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -494,7 +494,7 @@ if (SYS_TARGET === false) { // Bootstrap::mylog("sys_temp: ".SYS_TEMP); $arrayUpdating = Bootstrap::isPMUnderUpdating(); -if ($arrayUpdating['action']) { +if (isset($arrayUpdating['action']) && $arrayUpdating['action']) { if ($arrayUpdating['workspace'] == "true" || $arrayUpdating['workspace'] == SYS_TEMP) { header("location: /update/updating.php"); if (DEBUG_TIME_LOG) {