Changeset 6206

Timestamp:

08/20/08 16:41:18 (5 months ago)

Author:

jmathis

Message:

bug #147

Location:

trunk/centreon/www/include/views/graphs

Files:

• GetODSXmlGraph.php (modified) (9 diffs)
• GetODSXmlTree.php (modified) (1 diff)

trunk/centreon/www/include/views/graphs/GetODSXmlGraph.php

@@ -48 +48 @@
          */
         function getMyHostIDService($svc_id = NULL)     {
-                if (!$svc_id) return;
                 global $pearDB;
+                
+                if (!$svc_id) 
+                        return;
+                
                 $DBRESULT =& $pearDB->query("SELECT host_id FROM host h, host_service_relation hs WHERE h.host_id = hs.host_host_id AND hs.service_service_id = '".$svc_id."'");
                 if (PEAR::isError($DBRESULT))
@@ -121 +124 @@
  
         $graphTs = array( NULL => NULL );
-        $DBRESULT =& $pearDB->query("SELECT graph_id, name FROM giv_graphs_template ORDER BY name");
+        $DBRESULT =& $pearDB->query("SELECT `graph_id`, `name` FROM `giv_graphs_template` ORDER BY `name`");
         if (PEAR::isError($DBRESULT))
                 print "Mysql Error : ".$DBRESULT->getDebugInfo();
@@ -142 +145 @@
                 $tab_tmp = split(",", $openid);
         
+                print_r($tab_tmp);
+        
                 foreach ($tab_tmp as $openid) {
                         $tab_tmp = split("_", $openid);
                         $id = $tab_tmp[1];
                         $type = $tab_tmp[0];
+                        
+                        print "|$type|";
                 
                         if ($type == 'HG')      {
+                                
                                 $hosts = getMyHostGroupHosts($id);
                                 foreach ($hosts as $host)       {
@@ -166 +174 @@
                                 
                         } else if ($type == 'HH')       {
+                                
                                 $services = getMyHostServices($id);
                                 foreach ($services as $svc_id => $svc_name)     {
@@ -177 +186 @@
                                         }
                                 }
+                                
                         } else if ($type == 'ST')       {
+                                
                                 $services = getMyServiceGroupServices($id);
                                 foreach ($services as $svc_id => $svc_name)     { 
@@ -186 +197 @@
                                         }
                                 }
+                                
                         } else if ($type == 'MS')       {
-                                array_push($tab_id,$openid);
+                                array_push($tab_id, $openid);
                         } else  {
-                                $hosts = getMyServiceHosts($id);
-                                if ($hosts)     {
-                                        $host_id = array_pop($hosts);
-                                        if (service_has_graph($host_id, $id) && (($is_admin) || (!$is_admin && isset($lca["LcaHost"][getMyHostName($id)]) && isset($lca["LcaHost"][getMyHostName($id)]["svc"][getMyServiceName($id)]))))
-                                                array_push($tab_id, $openid);
+                                if (service_has_graph($tab_tmp[2], $tab_tmp[1]) 
+                                        && (($is_admin) || 
+                                                (!$is_admin && isset($lca["LcaHost"][getMyHostName($tab_tmp[2])]) 
+                                                && isset($lca["LcaHost"][getMyHostName($tab_tmp[2])]["svc"][getMyServiceName($tab_tmp[1])])))){
+                                        array_push($tab_id, $openid);
                                 }
                         } 
-                        
                 }
         }
@@ -206 +217 @@
         $tab_id = array();
         $tab_real_id = array();
-        
+
         if (count($tab_tmp)){
                 foreach ($tab_tmp as $openid)   {
@@ -228 +239 @@
         
         $tab_class = array("1" => "list_one", "0" => "list_two");
-
+        
         foreach ($tab_real_id as $key => $openid) {
                 $bad_value = 0; 
@@ -434 +445 @@
                 
                         if ($type == "SS"){
-                                print "|".$openid."|";
                                 $tab_tmp = split("_", $openid);
                                 $DBRESULT2 =& $pearDBO->query("SELECT id, service_id, service_description, host_name, special FROM index_data WHERE `trashed` = '0' AND special = '0' AND host_id = '".$tab_tmp[2]."' AND service_id = '".$tab_tmp[1]."'");

trunk/centreon/www/include/views/graphs/GetODSXmlTree.php

@@ -143 +143 @@
                          * get services for host
                          */
-                        $services = getMyHostServices($id);
+                        $services = getMyHostActiveServices($id);
                         $graphList = getMyHostGraphs($id);
                     $host_name = getMyHostName($id);