From c2f53e76fde1ab534e67a9227d4f0adcde05dfa4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 28 Oct 2009 14:05:37 -0400
Subject: [PATCH] Fix in maildrop plugin.
---
interface/web/monitor/show_log.php | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index 02b321a..d2f91d8 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -44,41 +44,59 @@
$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
$logParam = $_GET["log"];
+/* Get some translations */
+$monTransDate = $app->lng("monitor_settings_datafromdate_txt");
+$monTransSrv = $app->lng("monitor_settings_server_txt");
+$monTransRefreshsq = $app->lng("monitor_settings_refreshsq_txt");
+
/*
Setting the db-type and the caption
*/
switch($logParam) {
case 'log_mail':
$logId = 'log_mail';
- $title = 'Mail - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_mail_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_mail_warn':
$logId = 'log_mail_warn';
- $title = 'Mail-Warn - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_mailwarn_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_mail_err':
$logId = 'log_mail_err';
- $title = 'Mail-Error - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_mailerr_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_messages':
$logId = 'log_messages';
- $title = 'System (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_messages_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
+ break;
+ case 'log_ispc_cron':
+ $logId = 'log_ispc_cron';
+ $title = $app->lng("monitor_logs_ispccron_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_freshclam':
$logId = 'log_freshclam';
- $title = 'Freshclam - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_freshclam_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_clamav':
$logId = 'log_clamav';
- $title = 'Clamav - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_clamav_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
case 'log_ispconfig':
$logId = 'log_ispconfig';
- $title = 'ISP Config - Log (Server: ' . $_SESSION['monitor']['server_name'] . ')';
+ $title = $app->lng("monitor_logs_ispc_txt").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
+ $description = '';
break;
default:
$logId = '???';
$title = '???';
+ $description = '';
break;
}
@@ -101,7 +119,7 @@
/* fetch the Data from the DB */
-$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = '" . $app->dbmaster->quote($logId) . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
+$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = '" . $app->db->quote($logId) . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
@@ -115,7 +133,10 @@
$app->tpl->setVar("title", $title);
$app->tpl->setVar("log_id",$logId);
+$app->tpl->setVar("description", $description);
$app->tpl->setVar("time", getDataTime($logId));
+$app->tpl->setVar("monTransDate", $monTransDate);
+$app->tpl->setVar("monTransRefreshsq", $monTransRefreshsq);
$app->tpl_defaults();
$app->tpl->pparse();
--
Gitblit v1.9.1