From 4b8112e9ba2ac50e8c5343a1422604c2e75ebbc5 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Mena Date: Fri, 19 Jan 2018 16:03:32 -0400 Subject: [PATCH] HOR-4273 It is not possible to download the Support information in 'enterprise manager' - Add method get server version --- workflow/engine/controllers/adminProxy.php | 9 +++------ .../engine/src/ProcessMaker/Core/System.php | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 69513cf08..43ebb61f2 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1439,12 +1439,9 @@ class adminProxy extends HttpProxyController //PHP Version $params['php'] = $systemInfo->php->version; - //Apache - IIS Version - try { - $params['apache'] = apache_get_version(); - } catch (Exception $e) { - $params['apache'] = ''; - } + //Apache - nginx IIS Version + + $params['serverSoftwareVersion'] = System::getServerVersion(); //Installed Plugins (license info?) $arrayAddon = array (); diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php index e5b0e9837..abbbea16c 100644 --- a/workflow/engine/src/ProcessMaker/Core/System.php +++ b/workflow/engine/src/ProcessMaker/Core/System.php @@ -1291,5 +1291,25 @@ class System throw $e; } } + + /** + * Return version server software Apache/Nginx + * + * @return string version server software Apache/Nginx + */ + public static function getServerVersion() + { + $serverVersion = ''; + + if (stripos($_SERVER['SERVER_SOFTWARE'], 'apache') !== false) { + $serverVersion = apache_get_version(); + } + + if (stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) { + $serverVersion = $_SERVER['SERVER_SOFTWARE']; + } + + return $serverVersion; + } } // end System class