From 91e4d3af280c67c4c2668573185681bdedb52d2c Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Mon, 21 Dec 2015 10:46:27 +0000 Subject: [PATCH] Added display of project root --- app/system/app_languages.php | 20 ++++++++++++++++++++ app/system/system.php | 15 ++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/system/app_languages.php b/app/system/app_languages.php index 08271e3487..00c99be294 100644 --- a/app/system/app_languages.php +++ b/app/system/app_languages.php @@ -20,6 +20,16 @@ $text['title-sys-info']['sv-se'] = "System Information"; $text['title-sys-info']['uk'] = "Інформація про систему"; $text['title-sys-info']['de-at'] = "System Information"; +$text['title-os-info']['en-us'] = "Operating System Information"; +$text['title-os-info']['es-cl'] = "Información de Sistema Operativo"; +$text['title-os-info']['pt-pt'] = "Informação do Sistema Operativo"; +$text['title-os-info']['fr-fr'] = ""; +$text['title-os-info']['pt-br'] = "Informação do Sistema operacional"; +$text['title-os-info']['pl'] = "Informacje o System operacyjny"; +$text['title-os-info']['sv-se'] = "Operativsystem Systeminformation"; +$text['title-os-info']['uk'] = "Інформація про Операційна система "; +$text['title-os-info']['de-at'] = "Informationen zum Betriebssystem"; + $text['title-memcache']['en-us'] = "Memcache Information"; $text['title-memcache']['es-cl'] = "Información de Memcache"; $text['title-memcache']['pt-pt'] = "Informação da Memcache"; @@ -90,6 +100,16 @@ $text['label-version']['sv-se'] = ""; $text['label-version']['uk'] = ""; $text['label-version']['de-at'] = ""; +$text['label-path']['en-us'] = "Project Path"; +$text['label-path']['es-cl'] = ""; +$text['label-path']['pt-pt'] = ""; +$text['label-path']['fr-fr'] = ""; +$text['label-path']['pt-br'] = ""; +$text['label-path']['pl'] = ""; +$text['label-path']['sv-se'] = ""; +$text['label-path']['uk'] = ""; +$text['label-path']['de-at'] = ""; + $text['label-git_info']['en-us'] = "Git Information"; $text['label-git_info']['es-cl'] = ""; $text['label-git_info']['pt-pt'] = ""; diff --git a/app/system/system.php b/app/system/system.php index 67bb23a234..0e394b0bbc 100644 --- a/app/system/system.php +++ b/app/system/system.php @@ -85,7 +85,7 @@ $document['title'] = $text['title-sys-status']; echo " \n"; echo "\n"; - $git_path = normalize_path_to_os($_SERVER["DOCUMENT_ROOT"]."/.git"); + $git_path = normalize_path_to_os($_SERVER['PROJECT_ROOT']."/.git"); if(file_exists($git_path)){ $git_exe = 'git'; if (strtoupper(substr(PHP_OS, 0, 3)) === 'SUN') { $git_exe = shell_exec('which git'); } @@ -107,6 +107,15 @@ $document['title'] = $text['title-sys-status']; echo "\n"; } + echo "\n"; + echo " \n"; + echo " ".$text['label-path']."\n"; + echo " \n"; + echo " \n"; + echo " ".$_SERVER['PROJECT_ROOT']."\n"; + echo " \n"; + echo "\n"; + $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); if ($fp) { $switch_version = event_socket_request($fp, 'api version'); @@ -131,6 +140,10 @@ $document['title'] = $text['title-sys-status']; } } + echo "\n"; + echo " ".$text['title-os-info']."\n"; + echo "\n"; + echo "\n";