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

Merged in release/3.8.0 (pull request #8615)

Browse Source 
Updating develop branch with last changes in release/3.8.0, issues with plugins
This commit is contained in:
Julio Cesar Laura Avendaño
2022-10-07 19:46:08 +00:00
parent c9e5417750 de07d92983
commit 28a3b7b95d
3 changed files with 46 additions and 1 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 = new WebApplication();
$webApplication->setRootDir($this->option('processmakerPath')); $webApplication->setRootDir($this->option('processmakerPath'));
$webApplication->loadEnvironment($workspace, false); $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(); parent::handle();
} }

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

@@ -262,6 +262,30 @@ try {
if (!defined('DB_PASS')) { if (!defined('DB_PASS')) {
define('DB_PASS', $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')) { if (!defined('SYS_SKIN')) {
define('SYS_SKIN', $arraySystemConfiguration['default_skin']); define('SYS_SKIN', $arraySystemConfiguration['default_skin']);
} }

3
workflow/engine/controllers/adminProxy.php
View File

@@ -1,6 +1,7 @@
<?php <?php
use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Cache;
use PHPMailer\PHPMailer\SMTP;
use ProcessMaker\Core\System; use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry; use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Validation\ValidationUploadedFiles; use ProcessMaker\Validation\ValidationUploadedFiles;
@@ -430,7 +431,7 @@ class adminProxy extends HttpProxyController
$SMTPSecure = $_POST['UseSecureCon']; $SMTPSecure = $_POST['UseSecureCon'];
$Server = new Net($server); $Server = new Net($server);
$smtp = new SMTP; $smtp = new SMTP();
$timeout = 10; $timeout = 10;
$hostinfo = array(); $hostinfo = array();