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

Implemented Issue 594 (Feature Request) - Memcache status added to bottom of System Status page.

Browse Source
This commit is contained in:
Nate Jones
2014-06-13 20:28:46 +00:00
parent fe87fb6439
commit d459c0a0eb
3 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/system/app_config.php
View File

@@ -55,6 +55,10 @@
$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
$apps[$x]['permissions'][$y]['name'] = "system_view_memcache";
$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
$apps[$x]['permissions'][$y]['name'] = "system_view_backup";
$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";

15
app/system/app_languages.php
View File

@@ -80,4 +80,19 @@
$text['label-drive-percent']['es-cl'] = "Porcentaje Libre:";
$text['label-drive-percent']['pt-pt'] = "Percentagem Livre:";
$text['label-drive-percent']['fr-fr'] = "Pourcent Libre:";
$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";
$text['title-memcache']['fr-fr'] = "Information Memcache";
$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:";
$text['label-memcache_status']['fr-fr'] = "Statut Memcache:";
$text['message-unavailable']['en-us'] = "Unavailable";
$text['message-unavailable']['es-cl'] = "Indisponible";
$text['message-unavailable']['pt-pt'] = "Indisponível";
$text['message-unavailable']['fr-fr'] = "Indisponible";
?>

65
app/system/system.php
View File

@@ -27,10 +27,10 @@
include "root.php";
require_once "resources/require.php";
require_once "resources/check_auth.php";
if (permission_exists('system_view_info')
|| permission_exists('system_view_cpu')
|| permission_exists('system_view_hdd')
|| permission_exists('system_view_ram')
if (permission_exists('system_view_info')
|| permission_exists('system_view_cpu')
|| permission_exists('system_view_hdd')
|| permission_exists('system_view_ram')
|| permission_exists('system_view_backup')) {
//access granted
}
@@ -283,7 +283,7 @@ echo "<br />";
} else if (stristr(PHP_OS, 'WIN')) {
//disk_free_space returns the number of bytes available on the drive;
//1 kilobyte = 1024 byte
//1 megabyte = 1024 kilobyte
//1 megabyte = 1024 kilobyte
$driveletter = substr($_SERVER["DOCUMENT_ROOT"], 0, 2);
$disksize = round(disk_total_space($driveletter)/1024/1024, 2);
$disksizefree = round(disk_free_space($driveletter)/1024/1024, 2);
@@ -327,6 +327,61 @@ echo "<br />";
echo "<br />";
}
//memcache information
if (permission_exists('system_view_memcache')) {
echo "<table width='100%' border='0' cellpadding='7' cellspacing='0'>\n";
echo " <tr>\n";
echo " <th class='th' colspan='2' align='left'>".$text['title-memcache']."</th>\n";
echo " </tr>\n";
$mc_fail = false;
require_once "resources/classes/modules.php";
$mod = new switch_modules;
if ($mod -> active("mod_memcache")) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
if ($fp) {
$switch_cmd = "memcache status verbose";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
$mc_lines = preg_split('/\n/', $switch_result);
foreach($mc_lines as $mc_line) {
if (strlen(trim($mc_line)) > 0 && substr_count($mc_line, ': ') > 0) {
$mc_temp = explode(': ', $mc_line);
$mc_status[$mc_temp[0]] = $mc_temp[1];
}
}
if (is_array($mc_status) && sizeof($mc_status) > 0) {
foreach($mc_status as $mc_field => $mc_value) {
echo "<tr>\n";
echo " <td width='20%' class='vncell' style='text-align: left;'>".$mc_field.": </td>\n";
echo " <td class='row_style1'>".$mc_value."</td>\n";
echo "</tr>\n";
}
}
else { $mc_fail = true; }
}
else { $mc_fail = true; }
}
else { $mc_fail = true; }
if ($mc_fail) {
echo "<tr>\n";
echo " <td width='20%' class='vncell' style='text-align: left;'>".$text['label-memcache_status']."</td>\n";
echo " <td class='row_style1'>".$text['message-unavailable']."</td>\n";
echo "</tr>\n";
}
echo "</table>\n";
echo "<br /><br /><br />\n";
}
//backup
if (permission_exists('zzz') && $db_type == 'sqlite') {
require_once "core/backup/backupandrestore.php";