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

vogelor

2008-12-11 70e890ed44de037bd1207fc74872b57debb8de5a

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

 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);

 interface/web/monitor/datalog_del.php

File was renamed from interface/web/admin/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();

 interface/web/monitor/datalog_list.php

File was renamed from interface/web/admin/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();

 interface/web/monitor/lib/lang/bg_datalog_list.lng

 interface/web/monitor/lib/lang/bg_syslog_list.lng

 interface/web/monitor/lib/lang/de_datalog_list.lng

 interface/web/monitor/lib/lang/de_syslog_list.lng

 interface/web/monitor/lib/lang/en_datalog_list.lng

 interface/web/monitor/lib/lang/en_syslog_list.lng

 interface/web/monitor/lib/lang/es_datalog_list.lng

 interface/web/monitor/lib/lang/fr_datalog_list.lng

 interface/web/monitor/lib/lang/fr_syslog_list.lng

 interface/web/monitor/lib/lang/it_datalog_list.lng

 interface/web/monitor/lib/lang/it_syslog_list.lng

 interface/web/monitor/lib/lang/nl_datalog_list.lng

 interface/web/monitor/lib/lang/nl_syslog_list.lng

 interface/web/monitor/lib/lang/ru_datalog_list.lng

 interface/web/monitor/lib/lang/ru_syslog_list.lng

 interface/web/monitor/lib/lang/se_datalog_list.lng

 interface/web/monitor/lib/lang/se_syslog_list.lng

 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,

 interface/web/monitor/list/datalog.list.php

 interface/web/monitor/list/log.list.php

 interface/web/monitor/log_del.php

File was renamed from interface/web/admin/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();

 interface/web/monitor/log_list.php

File was renamed from interface/web/admin/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'";

 interface/web/monitor/templates/datalog_list.htm

File was renamed from interface/web/admin/templates/datalog_list.htm
@@ -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>

 interface/web/monitor/templates/syslog_list.htm

File was renamed from interface/web/admin/templates/syslog_list.htm
@@ -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>