Commit 70e890ed authored by vogelor's avatar vogelor
Browse files

moved the system-log and the jobqueue to the monitor.

parent a11603bb
......@@ -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);
......
......@@ -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();
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
......@@ -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'";
......
......@@ -16,11 +16,11 @@
</tr>
<tr>
<td class="tbl_col_tstamp">&nbsp;</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>
......
......@@ -15,10 +15,10 @@
</tr>
<tr>
<td class="tbl_col_tstamp">&nbsp;</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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment