nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the system support details

Browse Source 
- System details in Markdown format 
- Condense the system details
This commit is contained in:
FusionPBX
2025-05-02 18:06:25 -06:00
committed by GitHub
parent 54da8c7ff1
commit bc14b503ae
2 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/system/resources/functions/system_information.php
View File

@@ -18,7 +18,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2023
Portions created by the Initial Developer are Copyright (C) 2008-2025
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -109,25 +109,20 @@
$system_information['git']['date'] = 'unknown';
} else {
$git_branch = shell_exec($git_exe . ' --git-dir=' . $git_path . ' name-rev --name-only HEAD');
rtrim($git_branch);
$git_commit = shell_exec($git_exe . ' --git-dir=' . $git_path . ' rev-parse HEAD');
rtrim($git_commit);
$git_origin = shell_exec($git_exe . ' --git-dir=' . $git_path . ' config --get remote.origin.url');
rtrim($git_origin);
$git_origin = preg_replace('/\.git$/', '', $git_origin);
$git_status = shell_exec($git_exe . ' --git-dir=' . $git_path . ' status | grep "Your branch"');
if (!empty($git_status))
rtrim($git_status);
$git_age = shell_exec($git_exe . ' --git-dir=' . $git_path . ' log --pretty=format:%at "HEAD^!"');
rtrim($git_age);
$git_date = DateTime::createFromFormat('U', $git_age);
$git_age = $git_date->diff(new DateTime('now'));
$system_information['git']['branch'] = $git_branch;
$system_information['git']['origin'] = $git_origin;
$system_information['git']['commit'] = $git_commit;
$system_information['git']['status'] = $git_status;
$system_information['git']['age'] = $git_age;
$system_information['git']['date'] = $git_date;
$system_information['git']['branch'] = trim($git_branch) ?? '';
$system_information['git']['origin'] = trim($git_origin) ?? '';
$system_information['git']['commit'] = trim($git_commit) ?? '';
$system_information['git']['status'] = trim($git_status) ?? '';
$system_information['git']['age'] = $git_age ?? '';
$system_information['git']['date'] = $git_date ?? '';
}
} else {
$system_information['git']['path'] = 'unknown';
@@ -157,13 +152,13 @@
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
$data = explode("\n", shell_exec('systeminfo /FO CSV 2> nul'));
$data = array_combine(str_getcsv($data[0]), str_getcsv($data[1]));
$os_name = $data['OS Name'];
$os_version = $data['OS Version'];
$os_name = trim($data['OS Name']);
$os_version = trim($data['OS Version']);
unset($data);
} else {
$os_kernel = shell_exec('uname -a');
$os_name = shell_exec('lsb_release -is');
$os_version = shell_exec('lsb_release -rs');
$os_kernel = trim(shell_exec('uname -a'));
$os_name = trim(shell_exec('lsb_release -is'));
$os_version = trim(shell_exec('lsb_release -rs'));
}
$system_information['os']['name'] = $os_name;
$system_information['os']['version'] = $os_version;
@@ -278,7 +273,8 @@
//database version
$sql = "select version(); ";
$database = new database;
$database_version = $database->select($sql, null, 'column');
$database_name = $database->select($sql, null, 'column');
$database_array = explode(' ', $database_name);
//database connections
$sql = "select count(*) from pg_stat_activity; ";
@@ -291,7 +287,8 @@
$database_size = $database->select($sql, null, 'all');
$system_information['database']['type'] = 'pgsql';
$system_information['database']['version'] = $database_version;
$system_information['database']['name'] = $database_array[0];
$system_information['database']['version'] = $database_array[1];
$system_information['database']['connections'] = $database_connections;
foreach ($database_size as $row) {

35
app/system/system.php
View File

@@ -17,7 +17,7 @@
The Initial Developer of the Original Code is
Mark J Crane <markjcrane@fusionpbx.com>
Portions created by the Initial Developer are Copyright (C) 2008-2024
Con Portions created by the Initial Developer are Copyright (C) 2008-2025
the Initial Developer. All Rights Reserved.
Contributor(s):
@@ -381,6 +381,16 @@
echo "<tr>\n";
echo " <th class='th' colspan='2' align='left'>".$text['title-database']."</th>\n";
echo "</tr>\n";
echo "<tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
echo " ".$text['label-name']." \n";
echo " </td>\n";
echo " <td class=\"row_style1\">\n";
echo " ".$system_information['database']['name']."<br>\n";
echo " </td>\n";
echo "</tr>\n";
echo "<tr>\n";
echo " <td width='20%' class=\"vncell\" style='text-align: left;'>\n";
echo " ".$text['label-version']." \n";
@@ -448,6 +458,23 @@
}
if (permission_exists("system_view_support")) {
$system_support = "- Application\n";
$system_support .= " - version ".$system_information['version']."\n";
$system_support .= " - branch ".$system_information['git']['branch']."\n";
$system_support .= " - path ".$system_information['path']."\n";
$system_support .= "- PHP\n";
$system_support .= " - version ".$system_information['php']['version']."\n";
if (isset($system_information['switch']['version'])) {
$system_support .= "- Switch\n";
$system_support .= " - version ".$system_information['switch']['version']."\n";
}
$system_support .= "- Database\n";
$system_support .= " - name ".$system_information['database']['name']."\n";
$system_support .= " - version ".$system_information['database']['version']."\n";
$system_support .= "- Operating System\n";
$system_support .= " - name ".$system_information['os']['name']."\n";
$system_support .= " - version ".$system_information['os']['version']."\n";
echo "<div class='card'>\n";
echo "<table width='100%' border='0' cellpadding='7' cellspacing='0'>\n";
echo "<tr>\n";
@@ -458,7 +485,7 @@
echo "</tr>\n";
echo "<tr>\n";
echo " <td colspan='2' style='padding: 0;'>\n";
echo " <textarea class='formfld' id='system_information' name='system_information' style='display: none;'>".json_encode($system_information, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)."</textarea>\n";
echo " <textarea class='formfld' id='system_information' name='system_information' style='display: none;'>".escape($system_support)."</textarea>\n";
echo " <div id='editor' style='border-radius: 4px;'></div>\n";
echo " <table cellpadding='0' cellspacing='0' border='0' style='float: right; padding-top: 5px;'>\n";
echo " <tr>\n";
@@ -539,7 +566,7 @@
//load editor
echo " var editor = ace.edit('editor');\n";
echo " editor.setOptions({\n";
echo " mode: 'ace/mode/json',\n";
//echo " mode: 'ace/mode/json',\n";
echo " theme: 'ace/theme/'+document.getElementById('theme').options[document.getElementById('theme').selectedIndex].value,\n";
echo " selectionStyle: 'text',\n";
echo " cursorStyle: 'smooth',\n";
@@ -570,4 +597,4 @@
//include the footer
require_once "resources/footer.php";
?>
?>