diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 0846b9baf4ef0b6331b628930032a20ee40afd6c..c0847a8cafad5319ef05efb2c45a9872ac087b9c 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -64,14 +64,6 @@ $items[] = array( 'title' => 'Edit Server IP',
'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 2cc2fcadb6ff36f79ce83f341ff48adad9d53ee5..372c0a9c874bcd32ef9940fa19682731d2c955de 100644
--- a/interface/web/admin/datalog_del.php
+++ b/interface/web/monitor/datalog_del.php
@@ -43,7 +43,7 @@ require_once('../../lib/config.inc.php');
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 95%
rename from interface/web/admin/datalog_list.php
rename to interface/web/monitor/datalog_list.php
index d44ea012490b13d57f4cc8161c807223a8969e93..25005a7e1575298e77720c98615c7b5b67073e9e 100644
--- a/interface/web/admin/datalog_list.php
+++ b/interface/web/monitor/datalog_list.php
@@ -42,10 +42,10 @@ $list_def_file = "list/datalog.list.php";
******************************************/
//* 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 cfff3e6967de7d00dc0765f69f8214e09d61cb45..ac9b4861a24a560ba09be425caebcbcf180cf22b 100644
--- a/interface/web/monitor/lib/module.conf.php
+++ b/interface/web/monitor/lib/module.conf.php
@@ -14,6 +14,14 @@ $items[] = array( 'title' => "Show Overview",
'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);
@@ -138,10 +146,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,
'items' => $items);
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 22c51dab01da21e3ae8deed59170fc84b40be114..939e954fb23400b36b7b02e737fc470447585da4 100644
--- a/interface/web/admin/log_del.php
+++ b/interface/web/monitor/log_del.php
@@ -43,7 +43,7 @@ require_once('../../lib/config.inc.php');
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 890c90bc5f03b7319cd92e135bc506a5da4acf6f..d8304ad5899bdba2feaa0058dc2577eed628fad2 100644
--- a/interface/web/admin/log_list.php
+++ b/interface/web/monitor/log_list.php
@@ -42,7 +42,7 @@ $list_def_file = "list/log.list.php";
******************************************/
//* 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 34e6a33ae272eb7714c628245e53c72c841da1de..44e4c1d1452e561c37e8512048cc15b5f32fabec 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 45f2a3853bb0876703d4ef7bcb56377dd7197acc..4734736d3f12aac6ce4613825465a708a649ed22 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>