Changeset 5850

Timestamp:

07/23/08 16:20:57 (3 months ago)

Author:

shotamchay

Message:

there is no more error when loading configuration files

Location:

trunk/centreon/www/include/configuration

Files:

• configLoad/DB-Func.php (modified) (2 diffs)
• configNagios/DB-Func.php (modified) (1 diff)
• configObject/host/DB-Func.php (modified) (4 diffs)

trunk/centreon/www/include/configuration/configLoad/DB-Func.php

@@ -553 +553 @@
                         foreach ($tmpConf as $key=>$value)      {
                                 switch($key)    {
-                                        case "use" : $use = trim($tmpConf[$key]); unset ($tmpConf[$key]); break;
+                                        case "use" : $use = trim($tmpConf[$key]); /*unset ($tmpConf[$key])*/; break;
                                         case "name" : $tmpConf["host_name"] = $tmpConf[$key]; unset ($tmpConf[$key]); break;
                                         case "alias" : $tmpConf["host_alias"] = $tmpConf[$key]; unset ($tmpConf[$key]); break;
@@ -644 +644 @@
                         $tmpConf["ehi_statusmap_image"] = NULL;
                         $tmpConf["ehi_2d_coords"] = NULL;
-                        $tmpConf["ehi_3d_coords"] = NULL;
+                        $tmpConf["ehi_3d_coords"] = NULL;                       
                         $useTpl[0] = insertHostInDB($tmpConf);
                         $useTpl[1] = $use;

trunk/centreon/www/include/configuration/configNagios/DB-Func.php

@@ -272 +272 @@
         isset($ret["use_regexp_matching"]["use_regexp_matching"]) && $ret["use_regexp_matching"]["use_regexp_matching"] != 2 ? $rq .= "'".$ret["use_regexp_matching"]["use_regexp_matching"]."',  " : $rq .= "'2', ";
         isset($ret["use_true_regexp_matching"]["use_true_regexp_matching"]) && $ret["use_true_regexp_matching"]["use_true_regexp_matching"] != 2 ? $rq .= "'".$ret["use_true_regexp_matching"]["use_true_regexp_matching"]."',  " : $rq .= "'2', ";
-        isset($ret["admin_email"]) && $ret["admin_email"] != NULL ? $rq .= "'".htmlentities($ret["admin_email"], ENT_QUOTES)."',  " : $rq .= "NULL, ";
+        isset($ret["admin_email"]) && $ret["admin_email"] != NULL ? $rq .= "'".htmlentities($ret["admin_email"], ENT_QUOTES)."', " : $rq .= "NULL, ";        
         isset($ret["admin_pager"]) && $ret["admin_pager"] != NULL ? $rq .= "'".htmlentities($ret["admin_pager"], ENT_QUOTES)."', " : $rq .= "NULL, ";
         isset($ret["nagios_comment"]) && $ret["nagios_comment"] != NULL ? $rq .= "'".htmlentities($ret["nagios_comment"], ENT_QUOTES)."', " : $rq .= "NULL, ";
                 isset($ret["nagios_activate"]["nagios_activate"]) && $ret["nagios_activate"]["nagios_activate"] != NULL ? $rq .= "'".$ret["nagios_activate"]["nagios_activate"]."'," : $rq .= "'0',";
                 isset($ret["broker_module"]) && $ret["broker_module"] != NULL ? $rq .= "'".htmlentities($ret["broker_module"], ENT_QUOTES)."', " : $rq .= "NULL, ";
-                isset($ret["event_broker_options"]) && $ret["event_broker_options"] != NULL ? $rq .= "'".htmlentities($ret["event_broker_options"], ENT_QUOTES)."') " : $rq .= "NULL, ";
+                isset($ret["event_broker_options"]) && $ret["event_broker_options"] != NULL ? $rq .= "'".htmlentities($ret["event_broker_options"], ENT_QUOTES)."', " : $rq .= "NULL, ";
                 isset($ret["enable_embedded_perl"]["enable_embedded_perl"]) && $ret["enable_embedded_perl"]["enable_embedded_perl"] != 2 ? $rq .= "'".$ret["enable_embedded_perl"]["enable_embedded_perl"]."',  " : $rq .= "'2', ";
-                isset($ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"]) && $ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"] != 2 ? $rq .= "'".$ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"]."',  " : $rq .= "'2' ) ";
+                isset($ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"]) && $ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"] != 2 ? $rq .= "'".$ret["use_embedded_perl_implicitly"]["use_embedded_perl_implicitly"]."') " : $rq .= "'2' ) ";
  
         $DBRESULT =& $pearDB->query($rq);

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

@@ -389 +389 @@
         function insertHostInDB ($ret = array())        {
                 global $oreon;
+                
                 $host_id = insertHost($ret);
                 updateHostHostParent($host_id, $ret);
@@ -428 +429 @@
                 // For Centreon 2, we no longer need "host_template_model_htm_id" in Nagios 3
                 // but we try to keep it compatible with Nagios 2 which needs "host_template_model_htm_id" 
-                if (isset($_POST['nbOfSelect'])) {
+                if (isset($_POST['nbOfSelect']) || $oreon->user->get_version() >= 3) {
                         $DBRESULT =& $pearDB->query("SELECT host_id FROM `host` WHERE host_register='0' LIMIT 1");
                         if (PEAR::isError($DBRESULT))
@@ -490 +491 @@
                 **  Insert multiple templates
                 */
-                if (isset($_POST['nbOfSelect'])) { 
+                if (isset($ret["use"]) && $ret["use"]){
+                        $already_stored = array();
+                        $tplTab = split(",", $ret["use"]);
+                        $j = 0;
+                        foreach ($tplTab as $val) {
+                                $tplId = getMyHostID($val); 
+                                        
+                                if (!isset($already_stored[$tplId]) && $tplId) {
+                                        $rq = "INSERT INTO host_template_relation (`host_host_id`, `host_tpl_id`, `order`) VALUES (". $host_id['MAX(host_id)'] .", ". $tplId .", ". $j .")";
+                                        $DBRESULT =& $pearDB->query($rq);
+                                        if (PEAR::isError($DBRESULT))
+                                                print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
+                                        $j++;
+                                        $already_stored[$tplId] = 1;
+                                }
+                        }
+                }               
+                elseif (isset($_POST['nbOfSelect']) || $oreon->user->get_version() >= 3) {                      
                         $already_stored = array();
                         for ($i=0, $j = 1;$i <= $_POST['nbOfSelect']; $i++)
@@ -509 +527 @@
                  *  Insert on demand macros
                  */
-                if (isset($_POST['nbOfMacro'])) {                       
+                if (isset($_POST['nbOfMacro']) || $oreon->user->get_version() >= 3) {                   
                         $already_stored = array();              
                         for ($i=0; $i <= $_POST['nbOfMacro']; $i++)