dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

This commit is contained in:
markjcrane 2015-12-06 10:02:42 -07:00
parent 85f84e0ef6 444a375757
commit c788b8873e
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/system/app_languages.php
View File

@ -80,6 +80,16 @@ $text['label-os']['sv-se'] = "Operativsystem";
$text['label-os']['uk'] = "Операційна система ";
$text['label-os']['de-at'] = "Betriebssystem";
$text['label-git-info']['en-us'] = "Git Information";
$text['label-git-info']['es-cl'] = "";
$text['label-git-info']['pt-pt'] = "";
$text['label-git-info']['fr-fr'] = "";
$text['label-git-info']['pt-br'] = "";
$text['label-git-info']['pl'] = "";
$text['label-git-info']['sv-se'] = "";
$text['label-git-info']['uk'] = "";
$text['label-git-info']['de-at'] = "";
$text['label-memcache_status']['en-us'] = "Memcache Status";
$text['label-memcache_status']['es-cl'] = "Estado de Memcache";
$text['label-memcache_status']['pt-pt'] = "Estado da Memcache";

18
app/system/system.php
View File

@ -85,6 +85,24 @@ $document['title'] = $text['title-sys-status'];
echo " </td>\n";
echo "</tr>\n";
$git_path = normalize_path_to_os($_SERVER["DOCUMENT_ROOT"]."/.git");
$git_branch = shell_exec('git --git-dir='.$git_path.' name-rev --name-only HEAD');
rtrim($git_branch);
$git_commit = shell_exec('git --git-dir='.$git_path.' rev-parse HEAD');
rtrim($git_commit);
$git_origin = shell_exec('git --git-dir='.$git_path.' config --get remote.origin.url');
rtrim($git_commit);
echo "<tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
echo " ".$text['label-git-info']."\n";
echo " </td>\n";
echo " <td class=\"row_style1\">\n";
echo " Branch: '$git_branch'<br>\n";
echo " Commit: '$git_commit'<br>\n";
echo " Origin: '$git_origin'<br>\n";
echo " </td>\n";
echo "</tr>\n";
echo "<!--\n";
$tmp_result = shell_exec('uname -a');
echo "-->\n";