From 70e890ed44de037bd1207fc74872b57debb8de5a Mon Sep 17 00:00:00 2001
From: vogelor <vogelor@ispconfig3>
Date: Thu, 11 Dec 2008 14:42:24 -0500
Subject: [PATCH] moved the system-log and the jobqueue to the monitor.
---
interface/web/monitor/templates/syslog_list.htm | 6 +++---
interface/web/monitor/lib/lang/en_syslog_list.lng | 0
interface/web/monitor/lib/lang/fr_datalog_list.lng | 0
interface/web/monitor/lib/lang/nl_syslog_list.lng | 0
interface/web/monitor/lib/lang/ru_datalog_list.lng | 0
interface/web/monitor/lib/module.conf.php | 12 ++++++++----
interface/web/monitor/datalog_list.php | 4 ++--
interface/web/monitor/log_list.php | 2 +-
interface/web/monitor/lib/lang/se_datalog_list.lng | 0
interface/web/monitor/log_del.php | 2 +-
interface/web/monitor/list/log.list.php | 0
interface/web/monitor/lib/lang/de_datalog_list.lng | 0
interface/web/monitor/lib/lang/ru_syslog_list.lng | 0
interface/web/monitor/lib/lang/it_datalog_list.lng | 0
interface/web/monitor/lib/lang/se_syslog_list.lng | 0
interface/web/monitor/lib/lang/fr_syslog_list.lng | 0
interface/web/monitor/lib/lang/de_syslog_list.lng | 0
interface/web/monitor/lib/lang/bg_datalog_list.lng | 0
interface/web/monitor/lib/lang/nl_datalog_list.lng | 0
interface/web/monitor/lib/lang/bg_syslog_list.lng | 0
interface/web/monitor/datalog_del.php | 2 +-
interface/web/monitor/lib/lang/en_datalog_list.lng | 0
interface/web/monitor/templates/datalog_list.htm | 10 +++++-----
interface/web/monitor/lib/lang/es_datalog_list.lng | 0
interface/web/monitor/lib/lang/it_syslog_list.lng | 0
interface/web/monitor/list/datalog.list.php | 0
interface/web/admin/lib/module.conf.php | 8 --------
27 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 0846b9b..c0847a8 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -64,14 +64,6 @@
'target' => 'content',
'link' => 'admin/server_ip_list.php');
-$items[] = array( 'title' => 'Jobqueue',
- 'target' => 'content',
- 'link' => 'admin/datalog_list.php');
-
-$items[] = array( 'title' => 'Log',
- 'target' => 'content',
- 'link' => 'admin/log_list.php');
-
$module['nav'][] = array( 'title' => 'Servers',
'open' => 1,
'items' => $items);
diff --git a/interface/web/admin/datalog_del.php b/interface/web/monitor/datalog_del.php
similarity index 97%
rename from interface/web/admin/datalog_del.php
rename to interface/web/monitor/datalog_del.php
index 2cc2fca..372c0a9 100644
--- a/interface/web/admin/datalog_del.php
+++ b/interface/web/monitor/datalog_del.php
@@ -43,7 +43,7 @@
require_once('../../lib/app.inc.php');
//* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('monitor');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/admin/datalog_list.php b/interface/web/monitor/datalog_list.php
similarity index 94%
rename from interface/web/admin/datalog_list.php
rename to interface/web/monitor/datalog_list.php
index d44ea01..25005a7 100644
--- a/interface/web/admin/datalog_list.php
+++ b/interface/web/monitor/datalog_list.php
@@ -42,10 +42,10 @@
******************************************/
//* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('monitor');
$app->uses('listform_actions');
-//$app->listform_actions->SQLExtWhere = "wb = 'W'";
+$app->listform_actions->SQLExtWhere = "server_id != 0";
$app->listform_actions->SQLOrderBy = "ORDER BY tstamp DESC, datalog_id DESC";
$app->listform_actions->onLoad();
diff --git a/interface/web/admin/lib/lang/bg_datalog_list.lng b/interface/web/monitor/lib/lang/bg_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/bg_datalog_list.lng
rename to interface/web/monitor/lib/lang/bg_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/bg_syslog_list.lng b/interface/web/monitor/lib/lang/bg_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/bg_syslog_list.lng
rename to interface/web/monitor/lib/lang/bg_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/de_datalog_list.lng b/interface/web/monitor/lib/lang/de_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/de_datalog_list.lng
rename to interface/web/monitor/lib/lang/de_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/de_syslog_list.lng b/interface/web/monitor/lib/lang/de_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/de_syslog_list.lng
rename to interface/web/monitor/lib/lang/de_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/en_datalog_list.lng b/interface/web/monitor/lib/lang/en_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/en_datalog_list.lng
rename to interface/web/monitor/lib/lang/en_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/en_syslog_list.lng b/interface/web/monitor/lib/lang/en_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/en_syslog_list.lng
rename to interface/web/monitor/lib/lang/en_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/es_datalog_list.lng b/interface/web/monitor/lib/lang/es_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/es_datalog_list.lng
rename to interface/web/monitor/lib/lang/es_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/fr_datalog_list.lng b/interface/web/monitor/lib/lang/fr_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/fr_datalog_list.lng
rename to interface/web/monitor/lib/lang/fr_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/fr_syslog_list.lng b/interface/web/monitor/lib/lang/fr_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/fr_syslog_list.lng
rename to interface/web/monitor/lib/lang/fr_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/it_datalog_list.lng b/interface/web/monitor/lib/lang/it_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/it_datalog_list.lng
rename to interface/web/monitor/lib/lang/it_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/it_syslog_list.lng b/interface/web/monitor/lib/lang/it_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/it_syslog_list.lng
rename to interface/web/monitor/lib/lang/it_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/nl_datalog_list.lng b/interface/web/monitor/lib/lang/nl_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/nl_datalog_list.lng
rename to interface/web/monitor/lib/lang/nl_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/nl_syslog_list.lng b/interface/web/monitor/lib/lang/nl_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/nl_syslog_list.lng
rename to interface/web/monitor/lib/lang/nl_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/ru_datalog_list.lng b/interface/web/monitor/lib/lang/ru_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/ru_datalog_list.lng
rename to interface/web/monitor/lib/lang/ru_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/ru_syslog_list.lng b/interface/web/monitor/lib/lang/ru_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/ru_syslog_list.lng
rename to interface/web/monitor/lib/lang/ru_syslog_list.lng
diff --git a/interface/web/admin/lib/lang/se_datalog_list.lng b/interface/web/monitor/lib/lang/se_datalog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/se_datalog_list.lng
rename to interface/web/monitor/lib/lang/se_datalog_list.lng
diff --git a/interface/web/admin/lib/lang/se_syslog_list.lng b/interface/web/monitor/lib/lang/se_syslog_list.lng
similarity index 100%
rename from interface/web/admin/lib/lang/se_syslog_list.lng
rename to interface/web/monitor/lib/lang/se_syslog_list.lng
diff --git a/interface/web/monitor/lib/module.conf.php b/interface/web/monitor/lib/module.conf.php
index cfff3e6..ac9b486 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -14,6 +14,14 @@
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=system');
+$items[] = array( 'title' => "Show System-Log",
+ 'target' => 'content',
+ 'link' => 'monitor/log_list.php');
+
+$items[] = array( 'title' => 'Show Jobqueue',
+ 'target' => 'content',
+ 'link' => 'monitor/datalog_list.php');
+
$module["nav"][] = array( 'title' => 'System State (All Servers)',
'open' => 1,
'items' => $items);
@@ -137,10 +145,6 @@
$items[] = array( 'title' => "Show RKHunter-Log",
'target' => 'content',
'link' => 'monitor/show_data.php?type=rkhunter');
-
-$items[] = array( 'title' => "Show ISPConfig-Log",
- 'target' => 'content',
- 'link' => 'monitor/show_log.php?log=log_ispconfig');
$module["nav"][] = array( 'title' => 'Logfiles',
'open' => 1,
diff --git a/interface/web/admin/list/datalog.list.php b/interface/web/monitor/list/datalog.list.php
similarity index 100%
rename from interface/web/admin/list/datalog.list.php
rename to interface/web/monitor/list/datalog.list.php
diff --git a/interface/web/admin/list/log.list.php b/interface/web/monitor/list/log.list.php
similarity index 100%
rename from interface/web/admin/list/log.list.php
rename to interface/web/monitor/list/log.list.php
diff --git a/interface/web/admin/log_del.php b/interface/web/monitor/log_del.php
similarity index 97%
rename from interface/web/admin/log_del.php
rename to interface/web/monitor/log_del.php
index 22c51da..939e954 100644
--- a/interface/web/admin/log_del.php
+++ b/interface/web/monitor/log_del.php
@@ -43,7 +43,7 @@
require_once('../../lib/app.inc.php');
//* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('monitor');
$app->uses("tform_actions");
$app->tform_actions->onDelete();
diff --git a/interface/web/admin/log_list.php b/interface/web/monitor/log_list.php
similarity index 97%
rename from interface/web/admin/log_list.php
rename to interface/web/monitor/log_list.php
index 890c90b..d8304ad 100644
--- a/interface/web/admin/log_list.php
+++ b/interface/web/monitor/log_list.php
@@ -42,7 +42,7 @@
******************************************/
//* Check permissions for module
-$app->auth->check_module_permissions('admin');
+$app->auth->check_module_permissions('monitor');
$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";
diff --git a/interface/web/admin/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
similarity index 78%
rename from interface/web/admin/templates/datalog_list.htm
rename to interface/web/monitor/templates/datalog_list.htm
index 34e6a33..44e4c1d 100644
--- a/interface/web/admin/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -16,11 +16,11 @@
</tr>
<tr>
<td class="tbl_col_tstamp"> </td>
- <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/datalog_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','admin/datalog_list.php');">{tmpl_var name='search_action'}</select></td>
+ <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_action'}</select></td>
<td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
- <td class="tbl_col_status"><select name="search_status" onChange="submitForm('pageForm','admin/datalog_list.php');">{tmpl_var name='search_status'}</select></td>
- <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ <td class="tbl_col_status"><select name="search_status" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_status'}</select></td>
+ <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
<tbody>
@@ -33,7 +33,7 @@
<td class="tbl_col_status">{tmpl_var name="status"}</td>
<td class="tbl_col_buttons">
<div class="buttons icons16">
- <!--<a class="icons16 icoDelete" href="javascript: del_record('admin/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
+ <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
</div>
</td>
</tr>
diff --git a/interface/web/admin/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
similarity index 85%
rename from interface/web/admin/templates/syslog_list.htm
rename to interface/web/monitor/templates/syslog_list.htm
index 45f2a38..4734736 100644
--- a/interface/web/admin/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -15,10 +15,10 @@
</tr>
<tr>
<td class="tbl_col_tstamp"> </td>
- <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','admin/log_list.php');">{tmpl_var name='search_server_id'}</select></td>
- <td class="tbl_col_loglevel"><select name="search_loglevel" onChange="submitForm('pageForm','admin/log_list.php');">{tmpl_var name='search_loglevel'}</select></td>
+ <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','monitor/log_list.php');">{tmpl_var name='search_server_id'}</select></td>
+ <td class="tbl_col_loglevel"><select name="search_loglevel" onChange="submitForm('pageForm','monitor/log_list.php');">{tmpl_var name='search_loglevel'}</select></td>
<td class="tbl_col_message"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></td>
- <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+ <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
</tr>
</thead>
<tbody>
--
Gitblit v1.9.1