From a3e696cffaa1e3dc508b978428531638f3153c85 Mon Sep 17 00:00:00 2001 From: oilyflutesalad <oilyflutesalad@ispconfig3> Date: Sat, 16 Jan 2010 11:20:15 -0500 Subject: [PATCH] FIXED: Updated the title/description var names to reflect those in the template file so titles now show on the monitor pages. --- interface/web/monitor/lib/lang/en.lng | 77 +++++++++++++++++++------------------- interface/web/monitor/show_sys_state.php | 4 +- interface/web/monitor/show_data.php | 6 +- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/interface/web/monitor/lib/lang/en.lng b/interface/web/monitor/lib/lang/en.lng index f53629a..a28cf09 100644 --- a/interface/web/monitor/lib/lang/en.lng +++ b/interface/web/monitor/lib/lang/en.lng @@ -5,8 +5,8 @@ $wb["System load 5 minutes"] = "System load 5 minutes"; $wb["System load 15 minutes"] = "System load 15 minutes"; $wb['Server Load'] = 'Server Load'; -$wb['Disk usage'] = 'Disk usage'; -$wb['Memory usage'] = 'Memory usage'; +$wb['Disk usage'] = 'Disk Usage'; +$wb['Memory usage'] = 'Memory Usage'; $wb['no_data_serverload_txt'] = 'No data about the server load available at the moment. Please check again later.'; $wb['no_data_memusage_txt'] = 'No data about the memory usage available at the moment. Please check again later.'; $wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.'; @@ -20,24 +20,24 @@ $wb['Monitoring'] = 'Monitoring'; $wb['Server to Monitor'] = 'Server to Monitor'; $wb['Logfiles'] = 'Logfiles'; -$wb['Status of services'] = 'Status of services'; +$wb['Status of services'] = 'Status of Services'; $wb['No Refresh'] = 'No Refresh'; $wb["minutes"] = "minutes"; $wb["Show Overview"] = "Show Overview"; $wb["System State (All Servers)"] = "System State (All Servers)"; -$wb['Hardware-Information'] = 'Hardware-Information'; -$wb['Show CPU info'] = 'Show CPU info'; +$wb['Hardware-Information'] = 'Hardware Information'; +$wb['Show CPU info'] = 'Show CPU Info'; $wb['Server State'] = 'Server State'; $wb['Show Update State'] = 'Show Update State'; -$wb['Show RAID state'] = 'Show RAID state'; -$wb['Show Server load'] = 'Show Server load'; -$wb['Show Disk usage'] = 'Show Disk usage'; -$wb['Show Memory usage'] = 'Show Memory usage'; +$wb['Show RAID state'] = 'Show RAID State'; +$wb['Show Server load'] = 'Show Server Load'; +$wb['Show Disk usage'] = 'Show Disk Usage'; +$wb['Show Memory usage'] = 'Show Memory Usage'; $wb['Show Services'] = 'Show Services'; -$wb['Show Mail-Queue'] = 'Show Mail-Queue'; -$wb['Show Mail-Log'] = 'Show Mail-Log'; -$wb['Show Mail warn-Log'] = 'Show Mail warn-Log'; -$wb['Show Mail err-Log'] = 'Show Mail err-Log'; +$wb['Show Mail-Queue'] = 'Show Mail Queue'; +$wb['Show Mail-Log'] = 'Show Mail Log'; +$wb['Show Mail warn-Log'] = 'Show Mail Warn-Log'; +$wb['Show Mail err-Log'] = 'Show Mail Error-Log'; $wb['Show System-Log'] = 'Show System-Log'; $wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log'; $wb['Show Freshclam-Log'] = 'Show Freshclam-Log'; @@ -60,7 +60,7 @@ $wb['monitor_logs_messages_txt'] = 'System Messages - Log'; $wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log'; $wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log'; -$wb['monitor_logs_clamav_txt'] = 'Clamav - Log'; +$wb['monitor_logs_clamav_txt'] = 'ClamAV - Log'; $wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log'; $wb['monitor_nomdadm_txt'] = 'mdadm is not installed or your Server has no supported RAID'; $wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data'; @@ -73,8 +73,8 @@ $wb['monitor_serverstate_error_txt'] = 'error'; $wb['monitor_serverstate_moreinfo_txt'] = 'More information...'; $wb['monitor_serverstate_more_txt'] = 'More...'; -$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok'; -$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!'; +$wb['monitor_serverstate_fclamok_txt'] = 'Your virus protection is ok'; +$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your virus protection is OUTDATED!'; $wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!'; $wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok'; $wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full'; @@ -94,27 +94,27 @@ $wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load'; $wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load'; $wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???'; -$wb['monitor_serverstate_mailqok_txt'] = 'Your Mailq load is ok'; -$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mailq in under heavy load'; -$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq in under high load'; -$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq in under higher load'; -$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq in under highest load'; -$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???'; +$wb['monitor_serverstate_mailqok_txt'] = 'Your Mail queue load is ok'; +$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mail queue is under heavy load'; +$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mail queue is under high load'; +$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mail queue is under higher load'; +$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mail queue is under highest load'; +$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail queue: ???'; $wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok'; $wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode'; -$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULT disk. Replace as soon as possible!'; +$wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULTY disk. Replace as soon as possible!'; $wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore'; $wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???'; -$wb['monitor_serverstate_servicesonline_txt'] = 'All needed Services are online'; -$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed Services are offline'; -$wb['monitor_serverstate_servicesunknown_txt'] = 'Services:???'; -$wb['monitor_serverstate_syslogok_txt'] = 'The System-Log is O.K.'; -$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your System-Log'; -$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your System-Log'; -$wb['monitor_serverstate_syslogunknown_txt'] = 'sys-log:???'; -$wb['monitor_serverstate_updatesok_txt'] = 'Your System is up to date.'; -$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more Components needs a update'; -$wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update:???'; +$wb['monitor_serverstate_servicesonline_txt'] = 'All needed services are online'; +$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed services are offline'; +$wb['monitor_serverstate_servicesunknown_txt'] = 'Services: ???'; +$wb['monitor_serverstate_syslogok_txt'] = 'The System Log is O.K.'; +$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your system log'; +$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your system log'; +$wb['monitor_serverstate_syslogunknown_txt'] = 'System log: ???'; +$wb['monitor_serverstate_updatesok_txt'] = 'Your system is up to date.'; +$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more components needs an update'; +$wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???'; $wb['monitor_services_online_txt'] = 'Online'; $wb['monitor_services_offline_txt'] = 'Offline'; $wb['monitor_services_web_txt'] = 'Web-Server:'; @@ -126,12 +126,13 @@ $wb['monitor_services_mysql_txt'] = 'mySQL-Server:'; $wb['monitor_settings_datafromdate_txt'] = 'Data from: '; $wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i'; -$wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:'; +$wb['monitor_settings_refreshsq_txt'] = 'Refresh Sequence:'; $wb['monitor_settings_server_txt'] = 'Server'; $wb['monitor_title_cpuinfo_txt'] = 'CPU Info'; -$wb['monitor_title_updatestate_txt'] = 'Update State'; -$wb['monitor_title_mailq_txt'] = 'Mailqueue'; -$wb['monitor_title_raidstate_txt'] = 'RAID-State'; -$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log'; +$wb['monitor_title_updatestate_txt'] = 'Update Status'; +$wb['monitor_title_mailq_txt'] = 'Mail Queue'; +$wb['monitor_title_raidstate_txt'] = 'RAID Status'; +$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Log'; +$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log'; $wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring'; ?> diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php index 4f17991..5e7281d 100644 --- a/interface/web/monitor/show_data.php +++ b/interface/web/monitor/show_data.php @@ -114,7 +114,7 @@ $template = 'templates/show_data.htm'; $output .= showFail2ban(); $time = getDataTime('log_fail2ban'); - $title = 'fail2ban - Log (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')'; + $title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')'; $description = ''; break; default: @@ -129,8 +129,8 @@ $app->tpl->setInclude('content_tpl', $template); $app->tpl->setVar("output", $output); -$app->tpl->setVar("title", $title); -$app->tpl->setVar("description", $description); +$app->tpl->setVar("list_head_txt", $title); +$app->tpl->setVar("list_desc_txt", $description); $app->tpl->setVar("time", $time); $app->tpl->setVar("monTransDate", $monTransDate); diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php index b695a46..a5e1eb0 100644 --- a/interface/web/monitor/show_sys_state.php +++ b/interface/web/monitor/show_sys_state.php @@ -69,8 +69,8 @@ $app->tpl->setVar("state_data",$output); $app->tpl->setVar("state_type",$stateType); -$app->tpl->setVar("title",$title); -$app->tpl->setVar("description",$description); +$app->tpl->setVar("list_head_txt",$title); +$app->tpl->setVar("list_desc_txt",$description); $app->tpl->setVar("monTransRefreshsq", $monTransRefreshsq); /* -- Gitblit v1.9.1