Changeset 5913

Timestamp:

07/25/08 10:37:11 (4 months ago)

Author:

shotamchay

Message:

radiobox "create services linked to template" is no longer ignored

Files:

• trunk/centreon/www/include/configuration/configObject/host/DB-Func.php (modified) (6 diffs)

trunk/centreon/www/include/configuration/configObject/host/DB-Func.php

@@ -398 +398 @@
                 updateNagiosServerRelation($host_id, $ret);
                 global $form;
-                $ret = $form->getSubmitValues();
-                if (isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"] && $ret["host_template_model_htm_id"])
+                $ret = $form->getSubmitValues();                
+                if (isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"] && $ret["host_template_model_htm_id"] && $oreon->user->get_version() < 3)
                         createHostTemplateService($host_id, $ret["host_template_model_htm_id"]);
-                elseif($oreon->user->get_version() >= 3) {
+                elseif(isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"] && $oreon->user->get_version() >= 3) {                   
                         createHostTemplateService($host_id);
                 }
@@ -1378 +1378 @@
                 return 0;       
         }
+        if (file_exists($path."../service/DB-Func.php"))
+                require_once($path."../service/DB-Func.php");
+        else if (file_exists($path."../configObject/service/DB-Func.php"))
+                require_once($path."../configObject/service/DB-Func.php");
         $rq = "SELECT host_tpl_id FROM `host_template_relation` WHERE host_host_id = " . $hID2;
         $DBRESULT =& $pearDB->query($rq);
@@ -1409 +1413 @@
                 if (file_exists($path."../service/DB-Func.php"))
                         require_once($path."../service/DB-Func.php");
-                else if (file_exists($path."../service/DB-Func.php"))
+                else if (file_exists($path."../configObject/service/DB-Func.php"))
                         require_once($path."../configObject/service/DB-Func.php");
-                # If we select a host template model, we create the services linked to this host template model
+                # If we select a host template model, we create the services linked to this host template model         
                 if ($oreon->user->get_version() < 3) {
                         if ($htm_id)    {
@@ -1458 +1462 @@
                         }
                 }
-                else {                  
-                        generateHostServiceMultiTemplate($host_id, $host_id);                   
+                else {                                          
+                        global $form;
+                        $ret = $form->getSubmitValues();                        
+                        if (isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"])
+                                generateHostServiceMultiTemplate($host_id, $host_id);
                 }
         }
@@ -1494 +1501 @@
                 }
                 else if ($oreon->user->get_version() >= 3) {
-                        generateHostServiceMultiTemplate($host_id, $host_id);
+                        if (isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"])
+                                generateHostServiceMultiTemplate($host_id, $host_id);
                 }
         }
@@ -1531 +1539 @@
                 }
                 else if ($oreon->user->get_version() >= 3){
-                        generateHostServiceMultiTemplate($host_id, $host_id);
+                        if (isset($ret["dupSvTplAssoc"]["dupSvTplAssoc"]) && $ret["dupSvTplAssoc"]["dupSvTplAssoc"])
+                                generateHostServiceMultiTemplate($host_id, $host_id);
                 }
         }