add appendEntity() function to ExtendedDocument - note that it only works for *named...

[php-utility-classes.git] / include / classes / rrdstat.php-class

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 55d0c37a3ff1d310d18e5299b38948fec1f62298..1443ec6fa427929d064fc6d1571d4520442f6949 100644 (file)
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -440,11 +440,11 @@ class rrdstat {
     if (!is_numeric($end)) { $end = $this->last_update(); }
     elseif ($end < 0) { $end += $this->last_update(); }
     $end = intval($end/$resolution)*$resolution;
-    if (!is_numeric($start)) { $start = $end; }
+    if (!is_numeric($start)) { $start = $end-$resolution; }
     elseif ($start < 0) { $start += $end; }
     $start = intval($start/$resolution)*$resolution;
 
-    $fetch_cmd = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+    $fetch_cmd = 'LANG=C '.$this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
                  .' --start '.$start.' --end '.$end;
     $return = `$fetch_cmd 2>&1`;
 
@@ -476,11 +476,13 @@ class rrdstat {
 
   public function last_update() {
     // fetch time of last update in this RRD file
-    static $last_update;
+    static $last_update, $last_saved;
+    if (isset($last_update) && isset($last_saved) && ($last_saved <= (time() - 10))) { unset($last_update); }
     if (!isset($last_update) && in_array($this->status, array('ok','readonly'))) {
       $last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
       $return = trim(`$last_cmd 2>&1`);
       $last_update = is_numeric($return)?$return:null;
+      $last_saved = time();
     }
   return isset($last_update)?$last_update:null;
   }
@@ -972,7 +974,7 @@ class rrdstat {
     else { $sURL_add = '&sub=%s'; }
 
     $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
-    $num_cols = is_numeric($pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
+    $num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
     $num_rows = ceil(count($stats)/$num_cols);
 
     $out .= '<table class="overview">'."\n";
@@ -1203,7 +1205,7 @@ class rrdstat {
     foreach ($snames as $iname) {
       $newstat = array('name'=>$iname);
       $sfiles[] = isset($this->config_all[$iname]['file'])?$this->config_all[$iname]['file']:$iname.'.rrd';
-      if (is_array($this->config_all[$iname])) {
+      if (is_array(@$this->config_all[$iname])) {
         foreach ($this->config_all[$iname] as $key=>$val) {
           if (substr($key, 0, 5) == 'page.') { $newstat['sub'][] = substr($key, 5); }
         }