Skip to content

Commit a3e696c

Browse files
author
oilyflutesalad
committed
FIXED: Updated the title/description var names to reflect those in the template file so titles now show on the monitor pages.
1 parent 72a8443 commit a3e696c

File tree

3 files changed

+44
-43
lines changed

3 files changed

+44
-43
lines changed

‎interface/web/monitor/lib/lang/en.lng‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $wb["System load 1 minute"] = "System load 1 minute";
55
$wb["System load 5 minutes"] = "System load 5 minutes";
66
$wb["System load 15 minutes"] = "System load 15 minutes";
77
$wb['Server Load'] = 'Server Load';
8-
$wb['Disk usage'] = 'Disk usage';
9-
$wb['Memory usage'] = 'Memory usage';
8+
$wb['Disk usage'] = 'Disk Usage';
9+
$wb['Memory usage'] = 'Memory Usage';
1010
$wb['no_data_serverload_txt'] = 'No data about the server load available at the moment. Please check again later.';
1111
$wb['no_data_memusage_txt'] = 'No data about the memory usage available at the moment. Please check again later.';
1212
$wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.';
@@ -20,24 +20,24 @@ $wb['no_logdata_txt'] = 'No log data available at the moment. Please check again
2020
$wb['Monitoring'] = 'Monitoring';
2121
$wb['Server to Monitor'] = 'Server to Monitor';
2222
$wb['Logfiles'] = 'Logfiles';
23-
$wb['Status of services'] = 'Status of services';
23+
$wb['Status of services'] = 'Status of Services';
2424
$wb['No Refresh'] = 'No Refresh';
2525
$wb["minutes"] = "minutes";
2626
$wb["Show Overview"] = "Show Overview";
2727
$wb["System State (All Servers)"] = "System State (All Servers)";
28-
$wb['Hardware-Information'] = 'Hardware-Information';
29-
$wb['Show CPU info'] = 'Show CPU info';
28+
$wb['Hardware-Information'] = 'Hardware Information';
29+
$wb['Show CPU info'] = 'Show CPU Info';
3030
$wb['Server State'] = 'Server State';
3131
$wb['Show Update State'] = 'Show Update State';
32-
$wb['Show RAID state'] = 'Show RAID state';
33-
$wb['Show Server load'] = 'Show Server load';
34-
$wb['Show Disk usage'] = 'Show Disk usage';
35-
$wb['Show Memory usage'] = 'Show Memory usage';
32+
$wb['Show RAID state'] = 'Show RAID State';
33+
$wb['Show Server load'] = 'Show Server Load';
34+
$wb['Show Disk usage'] = 'Show Disk Usage';
35+
$wb['Show Memory usage'] = 'Show Memory Usage';
3636
$wb['Show Services'] = 'Show Services';
37-
$wb['Show Mail-Queue'] = 'Show Mail-Queue';
38-
$wb['Show Mail-Log'] = 'Show Mail-Log';
39-
$wb['Show Mail warn-Log'] = 'Show Mail warn-Log';
40-
$wb['Show Mail err-Log'] = 'Show Mail err-Log';
37+
$wb['Show Mail-Queue'] = 'Show Mail Queue';
38+
$wb['Show Mail-Log'] = 'Show Mail Log';
39+
$wb['Show Mail warn-Log'] = 'Show Mail Warn-Log';
40+
$wb['Show Mail err-Log'] = 'Show Mail Error-Log';
4141
$wb['Show System-Log'] = 'Show System-Log';
4242
$wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log';
4343
$wb['Show Freshclam-Log'] = 'Show Freshclam-Log';
@@ -60,7 +60,7 @@ $wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
6060
$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
6161
$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
6262
$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
63-
$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
63+
$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log';
6464
$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
6565
$wb['monitor_nomdadm_txt'] = 'mdadm is not installed or your Server has no supported RAID';
6666
$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data';
@@ -73,8 +73,8 @@ $wb['monitor_serverstate_critical_txt'] = 'critical';
7373
$wb['monitor_serverstate_error_txt'] = 'error';
7474
$wb['monitor_serverstate_moreinfo_txt'] = 'More information...';
7575
$wb['monitor_serverstate_more_txt'] = 'More...';
76-
$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok';
77-
$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!';
76+
$wb['monitor_serverstate_fclamok_txt'] = 'Your virus protection is ok';
77+
$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your virus protection is OUTDATED!';
7878
$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
7979
$wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok';
8080
$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full';
@@ -94,27 +94,27 @@ $wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load';
9494
$wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load';
9595
$wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load';
9696
$wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???';
97-
$wb['monitor_serverstate_mailqok_txt'] = 'Your Mailq load is ok';
98-
$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mailq in under heavy load';
99-
$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq in under high load';
100-
$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq in under higher load';
101-
$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq in under highest load';
102-
$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
97+
$wb['monitor_serverstate_mailqok_txt'] = 'Your Mail queue load is ok';
98+
$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mail queue is under heavy load';
99+
$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mail queue is under high load';
100+
$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mail queue is under higher load';
101+
$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mail queue is under highest load';
102+
$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail queue: ???';
103103
$wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok';
104104
$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
105-
$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULT disk. Replace as soon as possible!';
105+
$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULTY disk. Replace as soon as possible!';
106106
$wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore';
107107
$wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???';
108-
$wb['monitor_serverstate_servicesonline_txt'] = 'All needed Services are online';
109-
$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed Services are offline';
110-
$wb['monitor_serverstate_servicesunknown_txt'] = 'Services:???';
111-
$wb['monitor_serverstate_syslogok_txt'] = 'The System-Log is O.K.';
112-
$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your System-Log';
113-
$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your System-Log';
114-
$wb['monitor_serverstate_syslogunknown_txt'] = 'sys-log:???';
115-
$wb['monitor_serverstate_updatesok_txt'] = 'Your System is up to date.';
116-
$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more Components needs a update';
117-
$wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update:???';
108+
$wb['monitor_serverstate_servicesonline_txt'] = 'All needed services are online';
109+
$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed services are offline';
110+
$wb['monitor_serverstate_servicesunknown_txt'] = 'Services: ???';
111+
$wb['monitor_serverstate_syslogok_txt'] = 'The System Log is O.K.';
112+
$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your system log';
113+
$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your system log';
114+
$wb['monitor_serverstate_syslogunknown_txt'] = 'System log: ???';
115+
$wb['monitor_serverstate_updatesok_txt'] = 'Your system is up to date.';
116+
$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more components needs an update';
117+
$wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???';
118118
$wb['monitor_services_online_txt'] = 'Online';
119119
$wb['monitor_services_offline_txt'] = 'Offline';
120120
$wb['monitor_services_web_txt'] = 'Web-Server:';
@@ -126,12 +126,13 @@ $wb['monitor_services_mydns_txt'] = 'myDNS-Server:';
126126
$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
127127
$wb['monitor_settings_datafromdate_txt'] = 'Data from: ';
128128
$wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
129-
$wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:';
129+
$wb['monitor_settings_refreshsq_txt'] = 'Refresh Sequence:';
130130
$wb['monitor_settings_server_txt'] = 'Server';
131131
$wb['monitor_title_cpuinfo_txt'] = 'CPU Info';
132-
$wb['monitor_title_updatestate_txt'] = 'Update State';
133-
$wb['monitor_title_mailq_txt'] = 'Mailqueue';
134-
$wb['monitor_title_raidstate_txt'] = 'RAID-State';
135-
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
132+
$wb['monitor_title_updatestate_txt'] = 'Update Status';
133+
$wb['monitor_title_mailq_txt'] = 'Mail Queue';
134+
$wb['monitor_title_raidstate_txt'] = 'RAID Status';
135+
$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Log';
136+
$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log';
136137
$wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
137138
?>

‎interface/web/monitor/show_data.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
$template = 'templates/show_data.htm';
115115
$output .= showFail2ban();
116116
$time = getDataTime('log_fail2ban');
117-
$title = 'fail2ban - Log (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
117+
$title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
118118
$description = '';
119119
break;
120120
default:
@@ -129,8 +129,8 @@
129129
$app->tpl->setInclude('content_tpl', $template);
130130

131131
$app->tpl->setVar("output", $output);
132-
$app->tpl->setVar("title", $title);
133-
$app->tpl->setVar("description", $description);
132+
$app->tpl->setVar("list_head_txt", $title);
133+
$app->tpl->setVar("list_desc_txt", $description);
134134
$app->tpl->setVar("time", $time);
135135
$app->tpl->setVar("monTransDate", $monTransDate);
136136

‎interface/web/monitor/show_sys_state.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969

7070
$app->tpl->setVar("state_data",$output);
7171
$app->tpl->setVar("state_type",$stateType);
72-
$app->tpl->setVar("title",$title);
73-
$app->tpl->setVar("description",$description);
72+
$app->tpl->setVar("list_head_txt",$title);
73+
$app->tpl->setVar("list_desc_txt",$description);
7474
$app->tpl->setVar("monTransRefreshsq", $monTransRefreshsq);
7575

7676
/*

0 commit comments

Comments
 (0)