diff --git a/app/Console/Commands/AddParametersTrait.php b/app/Console/Commands/AddParametersTrait.php index 9b7e379da..c132c3541 100644 --- a/app/Console/Commands/AddParametersTrait.php +++ b/app/Console/Commands/AddParametersTrait.php @@ -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(); } diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 25e2f1169..38eea9358 100644 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -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']); }