fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-3845 Check and made the recommend changes in the Laravel upgrade guide

Browse Source
This commit is contained in:
Roly Gutierrez
2022-06-09 11:12:28 -04:00
committed by Mauricio Veliz
parent 6d1d7d752e
commit d0c5a23d67
10 changed files with 140 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/cases/cases_Step.php
View File

@@ -1073,6 +1073,9 @@ try {
}
}
if (!isset($aFields['PROCESS']['DISABLED'])) {
$aFields['PROCESS']['DISABLED'] = '';
}
$G_PUBLISH->AddContent('smarty', $tplFile, '', '', $aFields);
break;
case 'EXTERNAL':

32
workflow/engine/skinEngine/neoclassic/error404.php
View File

@@ -1,12 +1,14 @@
<?php if (function_exists("http_response_code")) {
<?php
if (function_exists("http_response_code")) {
http_response_code(404);
}
$http = G::is_https() ? "https" : "http";
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80") ? ":" . $_SERVER["SERVER_PORT"] : "");
$urlLogin = $http . "://" . $host . "/sys/en/neoclassic/login/login";
$urlHome = $urlLogin;
$urlHome = $urlLogin;
if (isset($_GET["url"]) && $_GET["url"] != "") {
@@ -16,31 +18,34 @@ if (isset($_GET["url"]) && $_GET["url"] != "") {
$sysSys = "";
$sysLang = "";
$sysSkin = "";
if (isset($url[1]) && preg_match("/^sys(.+)$/", $url[1], $match)) {
$sysSys = $match[1];
// Check if sys path exists
$checkDir = PATH_DATA."sites/".$sysSys;
if(!is_dir($checkDir)) {
$pathData = getConstant('PATH_DATA');
$checkDir = $pathData . "sites/" . $sysSys;
if (!is_dir($checkDir)) {
$sysSys = '';
}
}
if (isset($url[2])) {
$sysLang = $url[2];
}
if (isset($url[3])) {
$sysSkin = $url[3];
// Check if sys path exists
$checkDir = PATH_SKIN_ENGINE.$sysSkin;
if(!is_dir($checkDir)) {
$pathSkinEngine = getConstant('PATH_SKIN_ENGINE');
$checkDir = $pathSkinEngine . $sysSkin;
if (!is_dir($checkDir)) {
// Try this again
$checkDir = PATH_CUSTOM_SKINS.$sysSkin;
if(!is_dir($checkDir)) {
$pathCustomSkins = getConstant('PATH_CUSTOM_SKINS');
$checkDir = $pathCustomSkins . $sysSkin;
if (!is_dir($checkDir)) {
$sysSkin = '';
}
}
@@ -48,10 +53,9 @@ if (isset($_GET["url"]) && $_GET["url"] != "") {
if ($sysSys != "" && $sysLang != "" && $sysSkin != "") {
$urlLogin = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/login/login";
$urlHome = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/cases/main";
$urlHome = $http . "://" . $host . "/sys" . $sysSys . "/" . $sysLang . "/" . $sysSkin . "/cases/main";
}
}
?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>

11
workflow/engine/src/ProcessMaker/Util/helpers.php
View File

@@ -727,3 +727,14 @@ function calculateDate($iniDate, $timeUnit, $time)
return $datetime->format('Y-m-d H:i:s');
}
/**
* Get the constant value.
* @param string $name
* @param mixed $default
* @return mixed
*/
function getConstant(string $name, $default = '')
{
return defined($name) === true ? constant($name) : $default;
}