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

Merged in bugfix/PMCORE-4024 (pull request #8614)

Browse Source 
PMCORE-4024
This commit is contained in:
Julio Cesar Laura Avendaño
2022-10-07 19:08:02 +00:00
parent b31bf03804 c349ab5cd1
commit de07d92983
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Console/Commands/AddParametersTrait.php
View File

@@ -36,6 +36,26 @@ trait AddParametersTrait
$webApplication = new WebApplication();
$webApplication->setRootDir($this->option('processmakerPath'));
$webApplication->loadEnvironment($workspace, false);
if (is_file(PATH_DATA_SITE . PATH_SEP . '.server_info')) {
global $SERVER_INFO;
$SERVER_INFO = file_get_contents(PATH_DATA_SITE . PATH_SEP . '.server_info');
$SERVER_INFO = unserialize($SERVER_INFO);
if (!defined('SERVER_NAME')) {
define('SERVER_NAME', $SERVER_INFO['SERVER_NAME']);
}
if (!defined('SERVER_PORT')) {
define('SERVER_PORT', $SERVER_INFO['SERVER_PORT']);
}
if (!defined('REQUEST_SCHEME')) {
if ((isset($SERVER_INFO['HTTPS']) && $SERVER_INFO['HTTPS'] == 'on') ||(isset($SERVER_INFO['HTTP_X_FORWARDED_PROTO']) && $SERVER_INFO['HTTP_X_FORWARDED_PROTO'] == 'https')) {
define('REQUEST_SCHEME', 'https');
} else {
define('REQUEST_SCHEME', $SERVER_INFO['REQUEST_SCHEME']);
}
}
}
}
parent::handle();
}

24
workflow/engine/bin/cron_single.php
View File

@@ -262,6 +262,30 @@ try {
if (!defined('DB_PASS')) {
define('DB_PASS', $DB_PASS);
}
if (!defined('DB_RBAC_HOST')) {
define('DB_RBAC_HOST', $DB_RBAC_HOST);
}
if (!defined('DB_RBAC_NAME')) {
define('DB_RBAC_NAME', $DB_RBAC_NAME);
}
if (!defined('DB_RBAC_USER')) {
define('DB_RBAC_USER', $DB_RBAC_USER);
}
if (!defined('DB_RBAC_PASS')) {
define('DB_RBAC_PASS', $DB_RBAC_PASS);
}
if (!defined('DB_REPORT_HOST')) {
define('DB_REPORT_HOST', $DB_REPORT_HOST);
}
if (!defined('DB_REPORT_NAME')) {
define('DB_REPORT_NAME', $DB_REPORT_NAME);
}
if (!defined('DB_REPORT_USER')) {
define('DB_REPORT_USER', $DB_REPORT_USER);
}
if (!defined('DB_REPORT_PASS')) {
define('DB_REPORT_PASS', $DB_REPORT_PASS);
}
if (!defined('SYS_SKIN')) {
define('SYS_SKIN', $arraySystemConfiguration['default_skin']);
}