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

Fix CR

Browse Source
This commit is contained in:
Marco Antonio Nina Mena
2018-01-19 16:32:35 -04:00
parent 4b8112e9ba
commit 534b3d9bb0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1439,7 +1439,7 @@ class adminProxy extends HttpProxyController
//PHP Version //PHP Version
$params['php'] = $systemInfo->php->version; $params['php'] = $systemInfo->php->version;
//Apache - nginx IIS Version //Apache - nginx - IIS Version
$params['serverSoftwareVersion'] = System::getServerVersion(); $params['serverSoftwareVersion'] = System::getServerVersion();

4
workflow/engine/src/ProcessMaker/Core/System.php
View File

@@ -1299,10 +1299,10 @@ class System
*/ */
public static function getServerVersion() public static function getServerVersion()
{ {
$serverVersion = ''; $serverVersion = 'Undetermined';
if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) { if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) {
$serverVersion = apache_get_version(); $serverVersion = function_exists('apache_get_version') ? apache_get_version() : $_SERVER['SERVER_SOFTWARE'];
} }
if (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) { if (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {