Changeset 5810

Timestamp:

07/22/08 16:37:14 (4 months ago)

Author:

jmathis

Message:

* fixe bug #84
* and apply this path for downtime.
* Change rule for input in formulary.

Location:

trunk/centreon/www/include/monitoring

Files:

• comments/AddHostComment.php (modified) (2 diffs)
• comments/AddSvcComment.php (modified) (3 diffs)
• downtime/AddHostDowntime.php (modified) (2 diffs)
• downtime/AddSvcDowntime.php (modified) (3 diffs)

trunk/centreon/www/include/monitoring/comments/AddHostComment.php

@@ -25 +25 @@
         if (isset($_GET["host_name"])){
                 $host_id = getMyHostID($_GET["host_name"]);
-                if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && $isRestreint)
+                if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && !$is_admin)
                         $LCA_error = 1;
                 $host_name = $_GET["host_name"];
@@ -71 +71 @@
                 $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
                 
-                $form->addRule('host', _("Required Field"), 'required');
+                $form->addRule('host_id', _("Required Field"), 'required');
                 $form->addRule('comment', _("Required Field"), 'required');     
                 

trunk/centreon/www/include/monitoring/comments/AddSvcComment.php

@@ -45 +45 @@
                 $data = array("host_id" => $host_id, "service_id" => getMyServiceID($svc_description, $host_id));
                 
-                #
-                ## Database retrieve information for differents elements list we need on the page
-                #
+                /*
+                 * Database retrieve information for differents
+                 * elements list we need on the page
+                 */
                 $hosts = array(""=>"");
                 $DBRESULT =& $pearDB->query("SELECT host_id, host_name, host_template_model_htm_id FROM `host` WHERE host_register = '1' ORDER BY host_name");
@@ -55 +56 @@
                         if (!$host["host_name"])
                                 $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
-                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]]))
+                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]]) || $is_admin)
                                 $hosts[$host["host_id"]]= $host["host_name"];
                 }
@@ -88 +89 @@
                 $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
                 
-                $form->addRule('host', _("Required Field"), 'required');
-                $form->addRule('service', _("Required Field"), 'required');
+                /*
+                 * Add Rules
+                 */
+                $form->addRule('host_id', _("Required Field"), 'required');
+                $form->addRule('service_id', _("Required Field"), 'required');
                 $form->addRule('comment', _("Required Field"), 'required');     
                 

trunk/centreon/www/include/monitoring/downtime/AddHostDowntime.php

@@ -27 +27 @@
         if (isset($_GET["host_name"])){
                 $host_id = getMyHostID($_GET["host_name"]);
-                if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && $isRestreint)
+                if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && !$is_admin)
                         $LCA_error = 1;
                 $host_name = $_GET["host_name"];
@@ -79 +79 @@
                 $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
                 
-                $form->addRule('host', _("Required Field"), 'required');
+                $form->addRule('host_id', _("Required Field"), 'required');
                 $form->addRule('end', _("Required Field"), 'required');
                 $form->addRule('start', _("Required Field"), 'required');

trunk/centreon/www/include/monitoring/downtime/AddSvcDowntime.php

@@ -32 +32 @@
         if (isset($_GET["host_name"]) && isset($_GET["service_description"])){
                 $host_id = getMyHostID($_GET["host_name"]);
-                if (!isset($lcaHostByName[LcaHost] [$_GET["host_name"]]) && $isRestreint)
+                if (!isset($lcaHostByName["LcaHost"][$_GET["host_name"]]) && !$is_admin)
                         $LCA_error = 1;
                 $service_id = getMyServiceID($_GET["service_description"], $host_id);
@@ -55 +55 @@
                         if (!$host["host_name"])
                                 $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
-                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]]))
+                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]]) || $is_admin)
                                 $hosts[$host["host_id"]]= $host["host_name"];
                 }
@@ -92 +92 @@
                 $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
                 
-                $form->addRule('host', _("Required Field"), 'required');
+                $form->addRule('host_id', _("Required Field"), 'required');
+                $form->addRule('service_id', _("Required Field"), 'required');
                 $form->addRule('end', _("Required Field"), 'required');
                 $form->addRule('start', _("Required Field"), 'required');