From: hickert Date: Mon, 30 Oct 2006 12:12:15 +0000 (+0000) Subject: Added some more comments. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b3adc413874305c89ff3e15847d4c2290ad0b718;p=gosa.git Added some more comments. Moved GET POST to save_object function. Cleanup code git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4964 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/addons/logview/class_logview.inc b/plugins/addons/logview/class_logview.inc index 7e38148db..e7062ff30 100644 --- a/plugins/addons/logview/class_logview.inc +++ b/plugins/addons/logview/class_logview.inc @@ -16,253 +16,337 @@ class logview extends plugin var $loglevellist= array(); var $tilist= array(); var $fields= array("log_level", "host", "time_stamp", "message"); + var $last= array("log_level", "host", "time", "regex"); var $range = 25; function logview ($config, $dn= NULL) { - /* Include config object */ - $this->config= $config; - - /* Get global filter config */ - if (!is_global("logfilter")){ - $logfilter= array("time" => "1", - "log_level" => "!ALL", - "host" => "!All", - "regex" => "*"); - register_global("logfilter", $logfilter); - } + /* Include config object */ + $this->config= $config; + /* Get global filter config */ + if (!is_global("logfilter")){ + $logfilter= array( + "time" => "1", + "log_level" => "!All", + "host" => "!All", + "regex" => "*"); + register_global("logfilter", $logfilter); + } } function execute() { - /* Call parent execute */ - plugin::execute(); - - $logfilter= get_global("logfilter"); - $smarty= get_smarty(); - $smarty->assign("search_result", ""); - $smarty->assign("plug", "?plug=".validate($_GET['plug'])); - $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("time_image", get_template_path('images/time.png')); - $smarty->assign("server_image", get_template_path('images/server.png')); - $smarty->assign("log_image", get_template_path('images/log_warning.png')); - $smarty->assign("ruleset_image", get_template_path('images/edit.png')); - $smarty->assign("launchimage", get_template_path('images/launch.png')); - $smarty->assign("hostlist", $this->hostlist); - $smarty->assign("loglevellist", $this->loglevellist); - $smarty->assign("tilist", $this->tilist); - - $logfilter['regex']= preg_replace('/\%/', '*', $logfilter['regex']); - foreach( array("host", "log_level", "time", "regex") as $type){ - $smarty->assign("$type", $logfilter[$type]); - } - - if (!isset($this->config->data['SERVERS']['LOG'])){ - print_red (_("No LOG servers defined!")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - }elseif(!is_callable("mysql_connect")){ - print_red(_("There is no mysql extension available, please check your php setup.")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - }else{ - $cfg= $this->config->data['SERVERS']['LOG']; - - $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']); - if ($link === FALSE){ - print_red(_("Can't connect to log database, no logs can be shown!")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - } - if (! @mysql_select_db("gomon")){ - print_red(_("Can't select log database for log generation!")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - } - - /* Host list */ - $query= "SELECT DISTINCT host FROM golog LIMIT 200;"; - @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); - $result = @mysql_query($query); - if ($result === false){ - print_red(_("Query for log database failed!")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - } - - if(count($this->hostlist) == 0){ - while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ - $this->hostlist[$line['host']]= $line['host']; - } - $this->hostlist['!All']= _("All"); - ksort($this->hostlist); - } - - /* Log level list */ - $query= "SELECT DISTINCT log_level FROM golog LIMIT 200;"; - @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); - $result = @mysql_query($query); - if ($result === false){ - print_red(_("Query for log database failed!")); - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); - } - - if(count($this->loglevellist)){ - while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ - $this->loglevellist[$line['log_level']]= $line['log_level']; - } - $this->loglevellist['!All']= _("All"); - ksort($this->loglevellist); - } - } - - if(count($this->tilist) == 0){ - /* Time interval */ - $this->tilist= array("0" => _("one hour"), "1" => _("6 hours"), - "2" => _("12 hours"), "3" => _("24 hours"), - "4" => _("2 days"), "5" => _("one week"), - "6" => _("2 weeks"), "7" => _("one month")); - } - - if(isset($_POST['EntriesPerPage'])){ - $this->range = $_POST['EntriesPerPage']; - } - - /* Save data */ - $logfilter= get_global("logfilter"); - foreach( array("host", "time", "log_level", "regex") as $type){ - if (isset($_POST[$type])){ - $logfilter[$type]= $_POST[$type]; - } - } - if ($logfilter['regex'] == ""){ - $logfilter['regex']= '%'; - } else { - $logfilter['regex']= preg_replace('/\*/', '%', $logfilter['regex']); - } - register_global("logfilter", $logfilter); - - if (isset($_GET['start'])){ - $this->start= (int)$_GET['start']; - } - - /* Adapt sorting */ - if (isset($_GET['sort'])){ - if ($this->sort == (int)$_GET['sort']){ - if ($this->sort_direction == "down"){ - $this->sort_direction= "up"; - } else { - $this->sort_direction= "down"; - } - } - $this->sort= (int)$_GET['sort']; - if ($this->sort < 0 || $this->sort > 3){ - $this->sort= 0; - } - } - - /* Query stuff */ - $res= ""; - $cfg= $this->config->data['SERVERS']['LOG']; - $tmp= set_error_handler('dummy_error_handler'); - $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']); - set_error_handler($tmp); - if ($link === FALSE){ - print_red(_("Can't connect to log database, no logs can be shown!")); - } else { - if (! @mysql_select_db("gomon")){ - print_red(_("Can't select log database for log generation!")); - } else { - - /* Get number of entries */ - $query= "SELECT COUNT(*) FROM golog;"; - $result = @mysql_query($query); - $line= mysql_fetch_array($result, MYSQL_ASSOC); - $count= $line['COUNT(*)']; - if ($count > 25){ - $smarty->assign("range_selector", range_selector($count, $this->start, $this->range,"EntriesPerPage")); - } - - /* Assemble time query */ - switch ($logfilter['time']){ - case '0': - $start= date ("YmdHis", time() - 3600); - break; - ;; - case '1': - $start= date ("YmdHis", time() - 21600); - break; - ;; - case '2': - $start= date ("YmdHis", time() - 43200); - break; - ;; - case '3': - $start= date ("YmdHis", time() - 86400); - break; - ;; - case '4': - $start= date ("YmdHis", time() - 172800); - break; - ;; - case '5': - $start= date ("YmdHis", time() - 604800); - break; - ;; - case '6': - $start= date ("YmdHis", time() - 1209600); - break; - ;; - case '7': - $start= date ("YmdHis", time() - 2419200); - break; - ;; - } - - /* Assemble log level query */ - if ($logfilter['log_level'] == '!All'){ - $ll= ""; - } else { - $ll= "AND log_level='".$logfilter['log_level']."'"; - } - if ($logfilter['host'] == '!All'){ - $hf= ""; - } else { - $hf= "AND host='".$logfilter['host']."'"; - } - - /* Order setting */ - if ($this->sort_direction == "down"){ - $desc= "DESC"; - } else { - $desc= ""; - } - - $end= date ("YmdHis"); - $query= "SELECT * FROM golog WHERE message like '".$logfilter['regex']."' $ll $hf AND time_stamp <= $end AND time_stamp >= $start ORDER BY ".$this->fields[$this->sort]." $desc LIMIT ".$this->start.",25;"; - @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); - $result = @mysql_query($query); - - /* Display results */ - $mod= 0; - while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ - if ( ($mod++) & 1){ - $col= "background-color: #ECECEC;"; - } else { - $col= "background-color: #F5F5F5;"; - } - - $res.="\n"; - $res.=" - \"\"".$line['host'].""; - $res.="".$line['time_stamp']."".$line['message'].""; - $res.="\n"; - } - mysql_close($link); - } - } - - /* Show main page */ - return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + /* Call parent execute */ + plugin::execute(); + + $logfilter= get_global("logfilter"); + $smarty= get_smarty(); + $smarty->assign("search_result", ""); + $smarty->assign("plug", "?plug=".validate($_GET['plug'])); + $smarty->assign("search_image", get_template_path('images/search.png')); + $smarty->assign("time_image", get_template_path('images/time.png')); + $smarty->assign("server_image", get_template_path('images/server.png')); + $smarty->assign("log_image", get_template_path('images/log_warning.png')); + $smarty->assign("ruleset_image", get_template_path('images/edit.png')); + $smarty->assign("launchimage", get_template_path('images/launch.png')); + $smarty->assign("hostlist", $this->hostlist); + $smarty->assign("loglevellist", $this->loglevellist); + $smarty->assign("tilist", $this->tilist); + $smarty->assign("mode0", ""); + $smarty->assign("mode1", ""); + $smarty->assign("mode2", ""); + $smarty->assign("mode3", ""); + + /* Assign select option content */ + foreach( array("host", "log_level", "time", "regex") as $type){ + $smarty->assign("$type", $logfilter[$type]); + } + + /* Test connection to log database */ + if (!isset($this->config->data['SERVERS']['LOG'])){ + print_red (_("No LOG servers defined!")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + + }elseif(!is_callable("mysql_connect")){ + print_red(_("There is no mysql extension available, please check your php setup.")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + + }else{ + + /* Cehck connection informations */ + $cfg= $this->config->data['SERVERS']['LOG']; + + /* Open link to database and check if it is valid */ + $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']); + if ($link === FALSE){ + print_red(_("Can't connect to log database, no logs can be shown!")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + } + + /* check of log database is available */ + if (! @mysql_select_db("gomon")){ + print_red(_("Can't select log database for log generation!")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + } + + /* Get Host list, if still empty */ + if(count($this->hostlist) == 0){ + + /* Query database and check results */ + $query= "SELECT DISTINCT host FROM golog LIMIT 200;"; + @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); + $result = @mysql_query($query); + if ($result === false){ + print_red(_("Query for log database failed!. Requesting host names failed.")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + } + + /* Add hostnames to list */ + while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ + $this->hostlist[$line['host']]= $line['host']; + } + $this->hostlist['!All']= _("All"); + ksort($this->hostlist); + $smarty->assign("hostlist", $this->hostlist); + } + + /* Get log level list */ + if(count($this->loglevellist) == 0){ + + /* Try to get all used log level types */ + $query= "SELECT DISTINCT log_level FROM golog LIMIT 200;"; + @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); + $result = @mysql_query($query); + if ($result === false){ + print_red(_("Query for log database failed!")); + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); + } + + /* Add each etry to log level list */ + while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ + $this->loglevellist[$line['log_level']]= $line['log_level']; + } + $this->loglevellist['!All']= _("All"); + ksort($this->loglevellist); + $smarty->assign("loglevellist", $this->loglevellist); + } + } + + /* Set list of available time sequences */ + if(count($this->tilist) == 0){ + + /* Time interval */ + $this->tilist= array("0" => _("one hour"), "1" => _("6 hours"), + "2" => _("12 hours"), "3" => _("24 hours"), + "4" => _("2 days"), "5" => _("one week"), + "6" => _("2 weeks"), "7" => _("one month")); + $smarty->assign("tilist", $this->tilist); + } + + $smarty->assign("regex", $logfilter['regex']); + + /* Query stuff */ + $res= ""; + $cfg = $this->config->data['SERVERS']['LOG']; + $tmp = set_error_handler('dummy_error_handler'); + $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']); + set_error_handler($tmp); + + /* Test connection object && create up query string */ + if ($link === FALSE){ + print_red(_("Can't connect to log database, no logs can be shown!")); + } else { + if (! @mysql_select_db("gomon")){ + print_red(_("Can't select log database for log generation!")); + } else { + + /* Assemble time query */ + switch ($logfilter['time']){ + case '0': + $start= date ("YmdHis", time() - 3600); + break; + ;; + case '1': + $start= date ("YmdHis", time() - 21600); + break; + ;; + case '2': + $start= date ("YmdHis", time() - 43200); + break; + ;; + case '3': + $start= date ("YmdHis", time() - 86400); + break; + ;; + case '4': + $start= date ("YmdHis", time() - 172800); + break; + ;; + case '5': + $start= date ("YmdHis", time() - 604800); + break; + ;; + case '6': + $start= date ("YmdHis", time() - 1209600); + break; + ;; + case '7': + $start= date ("YmdHis", time() - 2419200); + break; + ;; + } + + /* Assemble log level query */ + if ($logfilter['log_level'] == '!All'){ + $ll= ""; + } else { + $ll= "AND log_level='".$logfilter['log_level']."'"; + } + if ($logfilter['host'] == '!All'){ + $hf= ""; + } else { + $hf= "AND host='".$logfilter['host']."'"; + } + + /* Order setting */ + if ($this->sort_direction == "down"){ + $desc= "DESC"; + $sort_sign = "\\/"; + } else { + $desc= ""; + $sort_sign="/\\"; + } + $end= date ("YmdHis"); + $query_base= " FROM + golog + WHERE + message like '".preg_replace("/\*/","%",$logfilter['regex'])."' + $ll + $hf + AND + time_stamp <= $end AND time_stamp >= $start"; + + /* Get number of entries */ + $query= "SELECT COUNT(*)".$query_base.";"; + $result = @mysql_query($query); + $line= mysql_fetch_array($result, MYSQL_ASSOC); + $count= $line['COUNT(*)']; + if ($count > 25){ + $smarty->assign("range_selector", range_selector($count, $this->start, $this->range,"EntriesPerPage")); + } else { + $smarty->assign("range_selector", ""); + } + + /* Query results */ + $query= "SELECT *".$query_base." ORDER BY ".$this->fields[$this->sort]." $desc LIMIT ".$this->start.",".$this->range.";"; + @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__, $query, "Database query"); + $result = @mysql_query($query); + + /* Display results */ + $mod= 0; + while ($line = mysql_fetch_array($result, MYSQL_ASSOC)){ + if ( ($mod++) & 1){ + $col= "background-color: #ECECEC;"; + } else { + $col= "background-color: #F5F5F5;"; + } + + $res.=" \n"; + $res.=" + \"".$line['log_level']."\" + + ". + $line['host']." + "; + $res.=" ". + $line['time_stamp']." + + ". + $line['message']." + "; + $res.=" \n"; + } + mysql_close($link); + $smarty->assign("mode".$this->sort, $sort_sign); + $smarty->assign("host", $logfilter['host']); + $smarty->assign("log_level", $logfilter['log_level']); + + $smarty->assign("search_result", $res); + } + } + + /* Show main page */ + return ($smarty->fetch (get_template_path('contents.tpl', TRUE))); } -} + function save_object() + { + /* Get submitted range */ + if(isset($_POST['EntriesPerPage'])){ + if(is_numeric($_POST['EntriesPerPage'])){ + $this->range = $_POST['EntriesPerPage']; + } + } + + /* Save data */ + $logfilter= get_global("logfilter"); + + /* Get actual select boxe values */ + $logfilter_changed = 0; + foreach( array("host", "time", "log_level", "regex") as $type){ + + /* Set new value and test if value has changed */ + $last[$type] = $logfilter[$type]; + if (isset($_POST[$type])){ + $logfilter[$type]= $_POST[$type]; + } + + if ($last[$type] != $logfilter[$type]){ + $logfilter_changed = 1; + } + } + + /* Filter regex values */ + if ($logfilter['regex'] == ""){ + $logfilter['regex']= '%'; + } else { + $new = preg_replace('/\*\**/', '*', $logfilter['regex']); + $logfilter['regex']= $new; + } + + /* Store filter values */ + register_global("logfilter", $logfilter); + + /* Set start value */ + if (isset($_GET['start'])){ + $this->start= (int)$_GET['start']; + } + + /* Reset page number if filter has changed */ + if ($logfilter_changed > 0){ + $this->start= 0; + } + + /* Adapt sorting */ + if (isset($_GET['sort'])){ + if ($this->sort == (int)$_GET['sort']){ + if ($this->sort_direction == "down"){ + $this->sort_direction= "up"; + } else { + $this->sort_direction= "down"; + } + } + $this->sort= (int)$_GET['sort']; + if ($this->sort < 0 || $this->sort > 3){ + $this->sort= 0; + } + } + } +} +// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/plugins/addons/logview/main.inc b/plugins/addons/logview/main.inc index 8a96e01e1..6b3469267 100644 --- a/plugins/addons/logview/main.inc +++ b/plugins/addons/logview/main.inc @@ -26,6 +26,7 @@ if (!$remove_lock){ $logview= $_SESSION['logview']; /* Execute formular */ + $display= $logview->save_object(); $display= $logview->execute (); $display.= "\n";