Changeset 6727

Timestamp:

10/06/08 14:20:18 (2 months ago)

Author:

jmathis

Message:

improve GMT use

Location:

trunk/centreon/www/include/views/graphs

Files:

• graphODS/generateImages/generateODSImage.php (modified) (1 diff)
• graphODS/generateImages/generateODSImageZoom.php (modified) (3 diffs)
• graphODS/generateImages/generateODSMetricImage.php (modified) (1 diff)
• statusGraphs/displayServiceStatus.php (modified) (5 diffs)

trunk/centreon/www/include/views/graphs/graphODS/generateImages/generateODSImage.php

@@ -301 +301 @@
 
                 $command_line = $oreon->optGen["rrdtool_path_bin"].$command_line." 2>&1";
+        
+                /*
+                 * Add Timezone for current user.
+                 */
+                 
+                $command_line = "export TZ='UTC".$CentreonGMT->getMyGMTForRRD()."' ; ".$command_line;
+        
                 $command_line = escape_command("$command_line");
                 if ($oreon->optGen["debug_rrdtool"] == "1")

trunk/centreon/www/include/views/graphs/graphODS/generateImages/generateODSImageZoom.php

@@ -74 +74 @@
                  * Get GMT for current user
                  */
-                $gmt = $CentreonGMT->getMyGMTFromSession($_GET["session_id"]);
+                $CentreonGMT->getMyGMTFromSession($_GET["session_id"]);
                 
                 /*
@@ -179 +179 @@
                 $cpt = 0;
                 $metrics = array();             
-                while ($metric =& $DBRESULT->fetchrow()){
+                while ($metric =& $DBRESULT->fetchrow()) {
                         if (!isset($_GET["metric"]) || (isset($_GET["metric"]) && isset($_GET["metric"][$metric["metric_id"]])) || isset($_GET["index_id"]) || $pass){
                                 $metrics[$metric["metric_id"]]["metric_id"] = $metric["metric_id"];
@@ -278 +278 @@
 
                 $command_line = $oreon->optGen["rrdtool_path_bin"].$command_line." 2>&1";
+                
+                /*
+                 * Add Timezone for current user.
+                 */
+                 
+                $command_line = "export TZ='CMT".$CentreonGMT->getMyGMTForRRD()."' ; ".$command_line;
+        
+                /*
+                 * Escape Special Chars
+                 */
                 $command_line = escape_command("$command_line");
+                
                 if ( $oreon->optGen["debug_rrdtool"] == "1" )
                         error_log("[" . date("d/m/Y H:s") ."] RDDTOOL : $command_line \n", 3, $oreon->optGen["debug_path"]."rrdtool.log");
 
-                //print $command_line;
                 $fp = popen($command_line  , 'r');
                 if (isset($fp) && $fp ) {

trunk/centreon/www/include/views/graphs/graphODS/generateImages/generateODSMetricImage.php

@@ -265 +265 @@
 
                 $command_line = $oreon->optGen["rrdtool_path_bin"].$command_line." 2>&1";
+                
+                /*
+                 * Add Timezone for current user.
+                 */
+                 
+                $command_line = "export TZ='CMT".$CentreonGMT->getMyGMTForRRD()."' ; ".$command_line;
+        
                 $command_line = escape_command("$command_line");
                 if ( $oreon->optGen["debug_rrdtool"] == "1" )

trunk/centreon/www/include/views/graphs/statusGraphs/displayServiceStatus.php

@@ -24 +24 @@
         require_once $centreon_path."www/DBconnect.php";
         require_once $centreon_path."www/class/Session.class.php";
+        require_once $centreon_path."/www/class/centreonGMT.class.php";
         require_once $centreon_path."www/class/Oreon.class.php";
+        require_once $centreon_path."www/include/common/common-Func.php";
 
         Session::start();
         $oreon =& $_SESSION["oreon"];
         
-        require_once $centreon_path."www/include/common/common-Func.php";
-
+        $CentreonGMT = new CentreonGMT();
+        
         function getStatusDBDir($pearDBO){
                 $data =& $pearDBO->query("SELECT `RRDdatabase_status_path` FROM `config` LIMIT 1");
@@ -41 +43 @@
          */     
 
-        (!isset($_GET["start"])) ? $start = time() - (60*60*48):$start = $_GET["start"];
+        (!isset($_GET["start"])) ? $start = time() - (60*60*24): $start = $_GET["start"];
         (!isset($_GET["end"])) ? $end = time() : $end = $_GET["end"];
 
@@ -60 +62 @@
                 exit;
         } else {
+                
+                /*
+                 * Get GMT for current user
+                 */
+                $CentreonGMT->getMyGMTFromSession($_GET["session_id"]);
+         
                 /*
                  * Get Values
@@ -169 +177 @@
                 $command_line .= " AREA:ok#19EE11 ";
                 $command_line .= " AREA:unk#FFFFFF ";
-                $command_line .= " COMMENT:\" \\l\" ";
+        
+                /*
+                 * Add comment start and end time inf graph footer.
+                 */
+                
+                $rrd_time  = addslashes($CentreonGMT->getDate("Y\/m\/d G:i", $start));
+                $rrd_time  = str_replace(":", "\:", $rrd_time);
+                $rrd_time2 = addslashes($CentreonGMT->getDate("Y\/m\/d G:i", $end)) ;
+                $rrd_time2 = str_replace(":", "\:", $rrd_time2);
+                $command_line .= " COMMENT:\" From $rrd_time to $rrd_time2 \\c\" ";
+                
+                $command_line = $oreon->optGen["rrdtool_path_bin"].$command_line." 2>&1";
+                
                 $command_line .= " LINE1:ok#19EE11:\"Ok\" ";
                 $command_line .= " LINE1:warn#F8C706:\"Warning\" ";
@@ -181 +201 @@
                 $command_line .= " GPRINT:v1:AVERAGE:\"Average\:%7.2lf%s\\l\"";
                 
-                $command_line = $oreon->optGen["rrdtool_path_bin"].$command_line." 2>&1";
+                /*
+                 * Add Timezone for current user.
+                 */
+                $command_line = "export TZ='CMT".$CentreonGMT->getMyGMTForRRD()."' ; ".$command_line;
+        
+                /*
+                 * Escale special char
+                 */
                 $command_line = escape_command("$command_line");
+                
                 if ($oreon->optGen["debug_rrdtool"] == "1")
                         error_log("[" . date("d/m/Y H:s") ."] RDDTOOL : $command_line \n", 3, $oreon->optGen["debug_path"]."rrdtool.log");
-                //print $command_line;
+                
                 $fp = popen($command_line  , 'r');
                 if (isset($fp) && $fp ) {