Enabled status field in sys datalog processing scripts.

tbrehm

2008-12-09 e45f6d6cfb2ea7170a47931260797dfdb1829b22

Enabled status field in sys datalog processing scripts.

 interface/web/admin/datalog_list.php

@@ -46,6 +46,7 @@

$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";
$app->listform_actions->SQLOrderBy = "ORDER BY tstamp DESC, datalog_id DESC";

$app->listform_actions->onLoad();


 interface/web/admin/list/log.list.php

@@ -39,9 +39,6 @@
//* Enable auth
$liste['auth']                = 'no';

$liste['sort_field']         = 'tstamp';
$liste['sort_direction']     = 'ASC';

/*****************************************************
* Suchfelder
*****************************************************/

 interface/web/admin/log_list.php

@@ -47,6 +47,8 @@
$app->uses('listform_actions');
//$app->listform_actions->SQLExtWhere = "wb = 'W'";

$app->listform_actions->SQLOrderBy = "ORDER BY tstamp DESC, syslog_id DESC";

$app->listform_actions->onLoad();



 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/syslog_list.php');">{tmpl_var name='search_server_id'}</select></td>
            <td class="tbl_col_loglevel"><select name="search_loglevel" onChange="submitForm('pageForm','admin/syslog_list.php');">{tmpl_var name='search_loglevel'}</select></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_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/syslog_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','admin/log_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
          </tr>
        </thead>
        <tbody>

 server/lib/classes/modules.inc.php

@@ -144,8 +144,10 @@
                    $this->raiseTableHook($d["dbtable"],$d["action"],$data);
                    $app->dbmaster->query("DELETE FROM sys_datalog WHERE datalog_id = ".$d["datalog_id"]);
                    $app->log("Deleting sys_datalog ID ".$d["datalog_id"],LOGLEVEL_DEBUG);
                    $app->db->query("UPDATE sys_datalog SET status = 'ok' WHERE datalog_id = ".$d["datalog_id"]);
                } else {
                    $app->log("Error in Repliction, changes were not processed.",LOGLEVEL_ERROR);
                    $app->db->query("UPDATE sys_datalog SET status = 'error' WHERE datalog_id = ".$d["datalog_id"]);
                }
            }
            
@@ -158,6 +160,7 @@
                $this->raiseTableHook($rec["dbtable"],$rec["action"],$data);
                $app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
                $app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
                $app->db->query("UPDATE sys_datalog SET status = 'ok' WHERE datalog_id = ".$rec["datalog_id"]);
            }
        }
        

 server/server.php

@@ -67,7 +67,7 @@
*/

// Check if there is anything to update
$tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE server_id = ".$conf["server_id"]);
$tmp_rec = $app->dbmaster->queryOneRecord("SELECT count(server_id) as number from sys_datalog WHERE server_id = ".$conf["server_id"]." AND status = 'pending'");
$tmp_num_records = $tmp_rec["number"];
unset($tmp_rec);