X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=18bd78633ab39ea4dee8f4402823bad207f91c11;hp=52ecfc1bd927a960744d08800cb70f5680495b7f;hb=253ead9f08505693b3a6d0cd1d83724e20be9586;hpb=ebe03325a72a0f62a83ee354d85c30436a46221e

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 52ecfc1..18bd786 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -48,7 +48,11 @@ class rrdstat {
 
     if (!is_null($conf_id)) {
       $iinfo = isset($complete_conf[$conf_id])?$complete_conf[$conf_id]:array();
-      if (isset($complete_conf['*'])) { $iinfo = array_merge_recursive($complete_conf['*'], $iinfo); }
+      if (isset($complete_conf['*'])) {
+        $iinfo = (array)$iinfo + (array)$complete_conf['*'];
+        if (isset($complete_conf['*']['graph'])) { $iinfo['graph'] = (array)$iinfo['graph'] + (array)$complete_conf['*']['graph']; }
+        if (isset($complete_conf['*']['page'])) { $iinfo['page'] = (array)$iinfo['page'] + (array)$complete_conf['*']['page']; }
+      }
     }
     else {
       $iinfo = $complete_conf;
@@ -234,15 +238,11 @@ class rrdstat {
     if (!in_array($this->status, array('ok','readonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
 
     // assemble configuration
-    $gconf = $this->config_graph;
+    $gconf = (array)$extra;
     if (!is_null($sub) && is_array($this->config_raw['graph.'.$sub])) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $this->config_raw['graph.'.$sub]); }
-      else { $gconf = $this->config_raw['graph.'.$sub]; }
-    }
-    if (is_array($extra)) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $extra); }
-      else { $gconf = $extra; }
+      $gconf = $gconf + $this->config_raw['graph.'.$sub];
     }
+    $gconf = $gconf + (array)$this->config_graph;
 
     if (isset($gconf['format']) && ($gconf['format'] == 'SVG')) {
       $format = $gconf['format']; $fmt_ext = '.svg';
@@ -456,15 +456,11 @@ class rrdstat {
     $basename = str_replace('.rrd', '', $this->rrd_file);
 
     // assemble configuration
-    $pconf = $this->config_page;
+    $pconf = (array)$page_extras;
     if (!is_null($sub) && is_array($this->config_raw['page.'.$sub])) {
-      if (is_array($pconf)) { $gconf = array_merge($pconf, $this->config_raw['page.'.$sub]); }
-      else { $pconf = $this->config_raw['page.'.$sub]; }
-    }
-    if (is_array($page_extras)) {
-      if (is_array($pconf)) { $pconf = array_merge($pconf, $page_extras); }
-      else { $pconf = $page_extras; }
+      $pconf = $pconf + $this->config_raw['page.'.$sub];
     }
+    $pconf = $pconf + (array)$this->config_page;
 
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$basename.' - RRD statistics';
     $gtitle = array();
@@ -521,10 +517,20 @@ class rrdstat {
             $gmeta['info'][] = $gline;
           }
         }
+        if (is_null($gfilename)) { $gfilename = $basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png'; }
+        if (isset($pconf['graph_url'])) {
+          $gURL = $pconf['graph_url'];
+          $fname = str_replace('%f', basename($gfilename), $gURL);
+          $fname = str_replace('%p', $gfilename, $gURL);
+          if (substr($gURL, -1) == '/') { $gURL .= $gfilename; }
+        }
+        else {
+          $gURL = $gfilename;
+        }
         $out .= '<div class="'.$tframe.'">';
 //         $out .= '<p>'.nl2br($ret).'</p>';
         $out .= '<h2>'.$gtitle[$tframe].'</h2>';
-        $out .= '<img src="'.(!is_null($gfilename)?$gfilename:$basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png').'"';
+        $out .= '<img src="'.$gURL.'"';
         $out .= ' alt="'.$basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
         $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">';
         if (isset($gmeta['data']) && count($gmeta['data'])) {