Upgrade code - step 1

workflow/engine/classes/Cases.php

@@ -4754,7 +4754,7 @@ class Cases
         $oPluginRegistry = PluginRegistry::loadSingleton();
         if ($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST)) {
             $folderData = new folderData(null, null, $sApplicationUID, null, $sUserUID);
-            $folderData->PMType = "INPUT";
+            $folderData->PMType = ["INPUT", "ATTACHED"];
             $folderData->returnList = true;
             $listing = $oPluginRegistry->executeTriggers(PM_CASE_DOCUMENT_LIST, $folderData);
         }
@@ -4962,6 +4962,15 @@ class Cases
 
             $aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_DOWNLOAD');
             $aFields['DOWNLOAD_LINK'] = "cases_ShowDocument?a=" . $aRow['APP_DOC_UID'];
+            if (is_array($listing)) {
+                foreach ($listing as $folderitem) {
+                    if ($folderitem->filename == $aRow['APP_DOC_UID']) {
+                        $aFields['DOWNLOAD_LABEL'] = G::LoadTranslation('ID_GET_EXTERNAL_FILE');
+                        $aFields['DOWNLOAD_LINK'] = $folderitem->downloadScript;
+                        continue;
+                    }
+                }
+            }
             if ($lastVersion == $aRow['DOC_VERSION']) {
                 //Show only last version
                 $aInputDocuments[] = $aFields;

workflow/engine/classes/DynaformEditor.php

@@ -188,7 +188,7 @@ class DynaformEditor extends WebResource
      * @param string $file
      * @return string
      */
-    public function _getFilename($file)
+    public static function _getFilename($file)
     {
         return (strcasecmp(substr($file, - 5), '_tmp0') == 0) ? substr($file, 0, strlen($file) - 5) : $file;
     }

workflow/engine/classes/DynaformEditorAjax.php

@@ -375,14 +375,14 @@ class DynaformEditorAjax extends DynaformEditor implements IDynaformEditorAjax
             self::_setTmpData($tmp);
         } else {
             $form = new Form($file, PATH_DYNAFORM, SYS_LANG, true);
-            $Properties = $tmp['Properties'];
-            if (!isset($Properties['ENABLETEMPLATE'])) {
-                $Properties['ENABLETEMPLATE'] = "0";
+            $properties = $tmp['Properties'];
+            if (!isset($properties['ENABLETEMPLATE'])) {
+                $properties['ENABLETEMPLATE'] = "0";
             }
-            $Properties['WIDTH'] = $form->width;
-            $Properties['MODE'] = $form->mode;
+            $properties['WIDTH'] = $form->width;
+            $properties['MODE'] = $form->mode;
         }
-        return $Properties;
+        return $properties;
     }
 
     /**

workflow/engine/classes/IndicatorsCalculator.php

@@ -185,7 +185,7 @@ class IndicatorsCalculator
                         tp.CON_VALUE as name,
                         efficiencyIndex,
                         inefficiencyCost,
-                        @curRow := @curRow + 1 AS rank
+                        @curRow := @curRow + 1 AS `rank`
                     from
                     (   select
                             PRO_UID,
@@ -243,7 +243,7 @@ class IndicatorsCalculator
                      inefficiencyCost,
                      averageTime,
                      deviationTime,
-                     @curRow := @curRow + 1 AS rank
+                     @curRow := @curRow + 1 AS `rank`
             from
             (	select
                    gu.GRP_UID,
@@ -301,7 +301,7 @@ class IndicatorsCalculator
                        inefficiencyCost,
                        averageTime,
                        deviationTime,
-                     @curRow := @curRow + 1 AS rank
+                     @curRow := @curRow + 1 AS `rank`
                     from
                     (	select
                            u.USR_UID,
@@ -401,7 +401,7 @@ class IndicatorsCalculator
         $params[":endYear"] = $endYear;
         $params[":endMonth"] = $endMonth;
 
-        $sqlString = 'SELECT $periodicitySelectFields ' . $this->ueiCostFormula . ' as EEC
+        $sqlString = "SELECT $periodicitySelectFields " . $this->ueiCostFormula . ' as EEC
                         FROM  USR_REPORTING
                         WHERE
                             IF(`YEAR` = :endYear, `MONTH`, `YEAR`) <= IF (`YEAR` = :endYear, :endMonth, :endYear)'

workflow/engine/classes/LdapAdvanced.php

@@ -2508,7 +2508,7 @@ class LdapAdvanced
             . "select GRP_TITLE,count(GRP_TITLE) "
             . "from GROUPWF "
             . "group by GRP_TITLE having count(GRP_TITLE)>1";
-        $results = DB::select(DB::raw($sql));
+        $results = DB::select(rawQuery($sql));
         if (empty($results)) {
             return false;
         }
@@ -2547,7 +2547,7 @@ class LdapAdvanced
             . "select DEP_TITLE,count(DEP_TITLE) "
             . "from DEPARTMENT "
             . "group by DEP_TITLE having count(DEP_TITLE)>1";
-        $results = DB::select(DB::raw($sql));
+        $results = DB::select(rawQuery($sql));
         if (empty($results)) {
             return false;
         }

workflow/engine/classes/Padl.php

@@ -612,6 +612,7 @@ class Padl
                 $decrypt .= $char;
             }
         }
+        $decrypt = trim($decrypt);
         # return the key
         return unserialize($decrypt);
     }

workflow/engine/classes/ReportTables.php

@@ -687,10 +687,17 @@ class ReportTables
                                     if (!isset($aFields[$aField['sFieldName']])) {
                                         $aFields[$aField['sFieldName']] = '';
                                     }
-                                    $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysqli_real_escape_string(
-                                            $con->getResource(),
-                                            $aFields[$aField['sFieldName']]
-                                        ) : '') . "'";
+                                    if (!isset($aFields[$aField['sFieldName'] . '_label'])) {
+                                        $aFields[$aField['sFieldName'] . '_label'] = '';
+                                    }
+                                    if (is_array($aFields[$aField['sFieldName']])) {
+                                        $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']][0] : '') . "'";
+                                    } else {
+                                        $sQuery .= ",'" . (isset($aFields[$aField['sFieldName']]) ? mysqli_real_escape_string(
+                                                $con->getResource(),
+                                                $aFields[$aField['sFieldName']]
+                                            ) : '') . "'";
+                                    }
                                     break;
                                 case 'date':
                                     $mysqlDate = (isset($aFields[$aField['sFieldName']]) ? $aFields[$aField['sFieldName']] : '');

workflow/engine/classes/WorkspaceTools.php

@@ -1763,7 +1763,7 @@ class WorkspaceTools
             $hosts = explode(':', $hostname);
             $hostname = array_shift($hosts);
 
-            $result = DB::connection($connection)->select(DB::raw("SELECT * FROM mysql.user WHERE user = '$username' AND host = '$hostname'"));
+            $result = DB::connection($connection)->select(rawQuery("SELECT * FROM mysql.user WHERE user = '$username' AND host = '$hostname'"));
 
             if (count($result) === 0) {
                 $message = "Unable to create user $username: ";
@@ -5256,7 +5256,7 @@ class WorkspaceTools
                         $query = "INSERT INTO `$tableName` ($fieldsSection) VALUES ($valuesSection);";
 
                         // Execute the query
-                        DB::connection()->statement(DB::raw($query));
+                        DB::connection()->statement(rawQuery($query));
                     } catch (Exception $e) {
                         $context["message"] = $e->getMessage();
                         $context["tableName"] = $tableName;
@@ -5283,7 +5283,7 @@ class WorkspaceTools
                     $query = "INSERT INTO `$tableName` ($fieldsSection) VALUES ($valuesSection);";
 
                     // Execute the query
-                    DB::connection()->statement(DB::raw($query));
+                    DB::connection()->statement(rawQuery($query));
                 } catch (Exception $e) {
                     $context["message"] = $e->getMessage();
                     $context["tableName"] = $tableName;

workflow/engine/classes/model/AdditionalTables.php

@@ -362,7 +362,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
 
             if (file_exists($sPath . $sClassName . '.php')) {
                 require_once $sPath . $sClassName . '.php';
@@ -421,7 +421,7 @@ class AdditionalTables extends BaseAdditionalTables
         $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
         $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
             ? $aData['ADD_TAB_CLASS_NAME']
-            : $this->getPHPName($aData['ADD_TAB_NAME']));
+            : self::getPHPName($aData['ADD_TAB_NAME']));
 
         if (file_exists($sPath . $sClassName . '.php')) {
             require_once $sPath . $sClassName . '.php';
@@ -450,8 +450,8 @@ class AdditionalTables extends BaseAdditionalTables
                         $round = '", "" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . "");';
 
                     } else {
-                        $double = $this->validateParameter($conf['report_table_double_number'], 1, 8, 4);
-                        $float = $this->validateParameter($conf['report_table_floating_number'], 1, 5, 4);
+                        $double = self::validateParameter($conf['report_table_double_number'], 1, 8, 4);
+                        $float = self::validateParameter($conf['report_table_floating_number'], 1, 5, 4);
                         $round = '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", ' . ($aField['FLD_TYPE'] == 'DOUBLE' ? $double : $float) . ')");';
                     }
                     
@@ -576,7 +576,7 @@ class AdditionalTables extends BaseAdditionalTables
      * 
      * @return int
      */
-    public function validateParameter($number, $min, $max, $default) {
+    public static function validateParameter($number, $min, $max, $default) {
         if (!is_numeric($number)) {
             $result = $default;
         } elseif ($number > $max) {
@@ -596,7 +596,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
 
             if (file_exists($sPath . $sClassName . '.php')) {
                 return $sClassName;
@@ -615,7 +615,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection($aData['DBS_UID']);
             $stmt = $oConnection->createStatement();
             require_once $sPath . $sClassName . '.php';
@@ -639,7 +639,7 @@ class AdditionalTables extends BaseAdditionalTables
             $oClass = new $sClassName;
             foreach ($aFields as $sKey => $sValue) {
                 if (!preg_match("/\(?\)/", $sKey)) {
-                    eval('$oClass->set' . $this->getPHPName($sKey) . '($aFields["' . $sKey . '"]);');
+                    eval('$oClass->set' . self::getPHPName($sKey) . '($aFields["' . $sKey . '"]);');
                 }
             }
             if ($oClass->validate()) {
@@ -668,7 +668,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
             foreach ($aKeys as $sName => $vValue) {
@@ -694,7 +694,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection(FieldsPeer::DATABASE_NAME);
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
@@ -740,7 +740,7 @@ class AdditionalTables extends BaseAdditionalTables
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
             $sClassName = ($aData['ADD_TAB_CLASS_NAME'] != ''
                 ? $aData['ADD_TAB_CLASS_NAME']
-                : $this->getPHPName($aData['ADD_TAB_NAME']));
+                : self::getPHPName($aData['ADD_TAB_NAME']));
             $oConnection = Propel::getConnection(FieldsPeer::DATABASE_NAME);
             require_once $sPath . $sClassName . '.php';
             $sKeys = '';
@@ -783,7 +783,7 @@ class AdditionalTables extends BaseAdditionalTables
     public function populateReportTable($tableName, $connection = 'rp', $type = 'NORMAL', $processUid = '', $gridKey = '', $addTabUid = '')
     {
         // Initializing variables
-        $this->className = $className = $this->getPHPName($tableName);
+        $this->className = $className = self::getPHPName($tableName);
         $this->classPeerName = $classPeerName = $className . 'Peer';
         $workspace = config("system.workspace");
         $n = Application::count();
@@ -1238,7 +1238,7 @@ class AdditionalTables extends BaseAdditionalTables
                 'FLOAT' => 'DOUBLE'
             );
             if ($sClassName == '') {
-                $sClassName = $this->getPHPName($sTableName);
+                $sClassName = self::getPHPName($sTableName);
             }
 
             $sPath = PATH_DB . config("system.workspace") . PATH_SEP . 'classes' . PATH_SEP;
@@ -1282,7 +1282,7 @@ class AdditionalTables extends BaseAdditionalTables
                 }
                 $aColumn = array(
                     'name' => $aField['FLD_NAME'],
-                    'phpName' => $this->getPHPName($aField['FLD_NAME']),
+                    'phpName' => self::getPHPName($aField['FLD_NAME']),
                     'type' => $aTypes[$aField['FLD_TYPE']],
                     'creoleType' => $aCreoleTypes[$aField['FLD_TYPE']],
                     'notNull' => ($aField['FLD_NULL'] == 'on' ? 'true' : 'false'),

workflow/engine/classes/model/Language.php

@@ -571,6 +571,12 @@ class Language extends BaseLanguage
         $buildhash = file_get_contents($buildhash);
 
         $michelangeloFE = PATH_HTML . "lib/js";
+
+        // Compatibility with Alpine Linux
+        if (!defined('GLOB_BRACE')) {
+            define('GLOB_BRACE', 0);
+        }
+
         $array = glob($michelangeloFE . '/' . '*' . $buildhash . '*', GLOB_BRACE);
         $pathFileMafe = array_pop($array);
         if (file_exists($pathFileMafe) && is_readable($pathFileMafe)) {