[Perfparse-cvs] _perfparse-phpgui perfparse.php, 1.30, 1.31 utils.php, 1.21, 1.22

[Florian G. <re...@us...>]

Update of /cvsroot/perfparse/_perfparse-phpgui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/phpgui

Modified Files:
	perfparse.php utils.php 
Log Message:
moved phpui installation to another subdirectory for easier install.
First changes in phpui for new table schema.


Index: utils.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/utils.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** utils.php	6 Sep 2006 21:58:41 -0000	1.21
--- utils.php	12 Sep 2006 15:30:49 -0000	1.22
***************
*** 100,106 ****
  
    function get_hosts(&$db) {
!     $query='SELECT h.host_name, g.group_name FROM perfdata_host h, 
!             perfdata_groups g, perfdata_host_groups hg where
!             h.host_id=gh.host_id and g.group_id=hg.group_id
              ORDER BY g.group_name, h.host_name';
      $res=$db->Execute($query);
--- 100,106 ----
  
    function get_hosts(&$db) {
!     $query='SELECT h.host_name, g.group_name FROM perfdata_host h 
!             LEFT JOIN perfdata_host_groups hg ON h.host_id=hg.host_id 
!             LEFT JOIN perfdata_groups g ON g.group_id=hg.group_id
              ORDER BY g.group_name, h.host_name';
      $res=$db->Execute($query);
***************
*** 540,545 ****
    function mktime_YmdHM($datestr) {
      $a=array();
!     if(!preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+)$/',$datestr,&$a)) {
!       preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)$/',$datestr,&$a); // with seconds
      }
      if(!isset($a[6])) $a[6]=0;
--- 540,545 ----
    function mktime_YmdHM($datestr) {
      $a=array();
!     if(!preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+)$/',$datestr,$a)) {
!       preg_match('/^(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)$/',$datestr,$a); // with seconds
      }
      if(!isset($a[6])) $a[6]=0;

Index: perfparse.php
===================================================================
RCS file: /cvsroot/perfparse/_perfparse-phpgui/perfparse.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** perfparse.php	7 Jul 2006 13:56:03 -0000	1.30
--- perfparse.php	12 Sep 2006 15:30:49 -0000	1.31
***************
*** 3,6 ****
--- 3,8 ----
    // Copyright (c) 2004,2005,2006 Florian Gleixner
    // Licensed under the GNU GENERAL PUBLIC LICENSE or the BSD License
+   //
+   // $Id$
    
    // magic quotes rubbish
***************
*** 24,29 ****
    // setup section
  
!   $cfgfile='../etc/perfparse.cfg';
!   $nagioscfgfile='../etc/nagios.cfg';
    
    // Compatibility functions.
--- 26,31 ----
    // setup section
  
!   $cfgfile='../../etc/perfparse.cfg';
!   $nagioscfgfile='../../etc/nagios.cfg';
    
    // Compatibility functions.
***************
*** 56,60 ****
    // Parse perfparse.conf to get database variables
  
!   $http_image_path="/nagios/images/";
  
    $configfile=@file($cfgfile);
--- 58,62 ----
    // Parse perfparse.conf to get database variables
  
!   $http_image_path="/nagios/perfparse/images/";
  
    $configfile=@file($cfgfile);