Changeset 6690

Timestamp:

10/02/08 11:37:32 (2 months ago)

Author:

dduponchelle

Message:

Host and service comments interface update to introduce new actions access.

Location:

trunk/centreon/www/include/monitoring/comments

Files:

• AddHostComment.php (modified) (1 diff)
• AddSvcComment.php (modified) (1 diff)
• template/comments.ihtml (modified) (2 diffs)
• viewComment.php (modified) (2 diffs)

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

@@ -18 +18 @@
         if (!isset($oreon))
                 exit();
+        
+        /*
+         * ACL Actions
+         */
+        $actions = false;
+        $GroupListofUser = array();
+        $actions = verifyActionsACLofUser("host_comment");
+        $GroupListofUser =  getGroupListofUser($pearDB);
+        
+        if ($actions == true || count($GroupListofUser) == 0) {
                 
-        $LCA_error = 0;
-        if (!$is_admin)
-                $lcaHostByName = getLcaHostByName($pearDB);
+                /*
+                 * ACL
+                 */
+                $LCA_error = 0;
+                if (!$is_admin)
+                        $lcaHostByName = getLcaHostByName($pearDB);
+                
+                if (isset($_GET["host_name"])){
+                        $host_id = getMyHostID($_GET["host_name"]);
+                        if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && !$is_admin)
+                                $LCA_error = 1;
+                        $host_name = $_GET["host_name"];
+                } else
+                        $host_name = NULL;
+                
+                if ($LCA_error)
+                        require_once("./alt_error.php");
+                else {
+                
+                        $data = array("host_id" => getMyHostID($host_name));
+                                
+                        ## 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");
+                        if (PEAR::isError($DBRESULT)) 
+                                print "AddHostComment - Rq 1 Mysql Error : ".$DBRESULT->getMessage();
+                        while ($host =& $DBRESULT->fetchRow()){
+                                if (!$host["host_name"])
+                                        $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
+                                if (isset($lcaHostByName["LcaHost"][$host["host_name"]])  || $is_admin)
+                                        $hosts[$host["host_id"]]= $host["host_name"];
+                        }
+                        $DBRESULT->free();
+                
+                        $debug = 0;
+                        $attrsTextI             = array("size"=>"3");
+                        $attrsText              = array("size"=>"30");
+                        $attrsTextarea  = array("rows"=>"7", "cols"=>"100");
+                
+                        ## Form begin
+                        $form = new HTML_QuickForm('Form', 'post', "?p=".$p);
+                        if ($o == "ah")
+                                $form->addElement('header', 'title', _("Add a comment for Host"));
         
-        if (isset($_GET["host_name"])){
-                $host_id = getMyHostID($_GET["host_name"]);
-                if (!isset($lcaHostByName["LcaHost"] [$_GET["host_name"]]) && !$is_admin)
-                        $LCA_error = 1;
-                $host_name = $_GET["host_name"];
-        } else
-                $host_name = NULL;
-        
-        if ($LCA_error)
+                        ## Indicator basic information
+                        
+                        $redirect =& $form->addElement('hidden', 'o');
+                        $redirect->setValue($o);
+                        
+                    $selHost =& $form->addElement('select', 'host_id', _("Host Name"), $hosts);
+                        $form->addElement('checkbox', 'persistant', _("Persistent"));
+                        $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
+                        
+                        $form->addRule('host_id', _("Required Field"), 'required');
+                        $form->addRule('comment', _("Required Field"), 'required');     
+                        
+                        $subA =& $form->addElement('submit', 'submitA', _("Save"));
+                        $res =& $form->addElement('reset', 'reset', _("Reset"));
+                        
+                        $form->setDefaults($data);
+                  
+                        $valid = false;
+                        if ((isset($_POST["submitA"]) && $_POST["submitA"]) && $form->validate())       {
+                                if (!isset($_POST["persistant"]))
+                                        $_POST["persistant"] = 0;
+                                if (!isset($_POST["comment"]))
+                                        $_POST["comment"] = 0;
+                                AddHostComment($_POST["host_id"], $_POST["comment"], $_POST["persistant"]);
+                                $valid = true;
+                        require_once($path."viewComment.php");
+                    } else {    
+                                # Smarty template Init
+                                $tpl = new Smarty();
+                                $tpl = initSmartyTpl($path, $tpl, "template/");
+                                        
+                                #Apply a template definition    
+                                $renderer =& new HTML_QuickForm_Renderer_ArraySmarty($tpl);
+                                $renderer->setRequiredTemplate('{$label}&nbsp;<font color="red" size="1">*</font>');
+                                $renderer->setErrorTemplate('<font color="red">{$error}</font><br />{$html}');
+                                $form->accept($renderer);                       
+                                $tpl->assign('form', $renderer->toArray());     
+                                $tpl->assign('o', $o);          
+                                $tpl->display("AddHostComment.ihtml");
+                    }
+                }
+        } else {
                 require_once("./alt_error.php");
-        else {
-        
-                $data = array("host_id" => getMyHostID($host_name));
-                        
-                ## 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");
-                if (PEAR::isError($DBRESULT)) 
-                        print "AddHostComment - Rq 1 Mysql Error : ".$DBRESULT->getMessage();
-                while ($host =& $DBRESULT->fetchRow()){
-                        if (!$host["host_name"])
-                                $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
-                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]])  || $is_admin)
-                                $hosts[$host["host_id"]]= $host["host_name"];
-                }
-                $DBRESULT->free();
-        
-                $debug = 0;
-                $attrsTextI             = array("size"=>"3");
-                $attrsText              = array("size"=>"30");
-                $attrsTextarea  = array("rows"=>"7", "cols"=>"100");
-        
-                ## Form begin
-                
-                $form = new HTML_QuickForm('Form', 'post', "?p=".$p);
-                if ($o == "ah")
-                        $form->addElement('header', 'title', _("Add a comment for Host"));
-
-                ## Indicator basic information
-                
-                $redirect =& $form->addElement('hidden', 'o');
-                $redirect->setValue($o);
-                
-            $selHost =& $form->addElement('select', 'host_id', _("Host Name"), $hosts);
-                $form->addElement('checkbox', 'persistant', _("Persistent"));
-                $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
-                
-                $form->addRule('host_id', _("Required Field"), 'required');
-                $form->addRule('comment', _("Required Field"), 'required');     
-                
-                $subA =& $form->addElement('submit', 'submitA', _("Save"));
-                $res =& $form->addElement('reset', 'reset', _("Reset"));
-                
-                $form->setDefaults($data);
-          
-                $valid = false;
-                if ((isset($_POST["submitA"]) && $_POST["submitA"]) && $form->validate())       {
-                        if (!isset($_POST["persistant"]))
-                                $_POST["persistant"] = 0;
-                        if (!isset($_POST["comment"]))
-                                $_POST["comment"] = 0;
-                        AddHostComment($_POST["host_id"], $_POST["comment"], $_POST["persistant"]);
-                        $valid = true;
-                require_once($path."viewComment.php");
-            } else {    
-                        # Smarty template Init
-                        $tpl = new Smarty();
-                        $tpl = initSmartyTpl($path, $tpl, "template/");
-                                
-                        #Apply a template definition    
-                        $renderer =& new HTML_QuickForm_Renderer_ArraySmarty($tpl);
-                        $renderer->setRequiredTemplate('{$label}&nbsp;<font color="red" size="1">*</font>');
-                        $renderer->setErrorTemplate('<font color="red">{$error}</font><br />{$html}');
-                        $form->accept($renderer);                       
-                        $tpl->assign('form', $renderer->toArray());     
-                        $tpl->assign('o', $o);          
-                        $tpl->display("AddHostComment.ihtml");
-            }
         }
 ?>

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

@@ -18 +18 @@
         if (!isset($oreon))
                 exit();
+        
+        $actions = false;
+        $actions = verifyActionsACLofUser("service_comment");
+        $GroupListofUser =  getGroupListofUser($pearDB);
+        
+        if ($actions == true || count($GroupListofUser) == 0) {                 
+                $LCA_error = 0;
+                
+                if (!$is_admin)
+                        $lcaHostByName = getLcaHostByName($pearDB);
+                                
+                isset($_GET["host_id"]) ? $cG = $_GET["host_id"] : $cG = NULL;
+                isset($_POST["host_id"]) ? $cP = $_POST["host_id"] : $cP = NULL;        
+                $cG ? $host_id = $cG : $host_id = $cP;
+                
+                if (isset($_GET["host_name"]) && isset($_GET["service_description"])){
+                        $host_id = getMyHostID($_GET["host_name"]);
+                        if (!$is_admin && !isset($lcaHostByName["LcaHost"][$_GET["host_name"]]))
+                                $LCA_error = 1;
+                        $service_id = getMyServiceID($_GET["service_description"], $host_id);
+                        $host_name = $_GET["host_name"];
+                        $svc_description = $_GET["service_description"];
+                } else  {
+                        $host_name = NULL;
+                        $svc_description = NULL;
+                }
+                
+                if ($LCA_error)
+                        require_once("./alt_error.php");
+                else {
+                        $data = array("host_id" => $host_id, "service_id" => getMyServiceID($svc_description, $host_id));
                         
-        $LCA_error = 0;
-        
-        if (!$is_admin)
-                $lcaHostByName = getLcaHostByName($pearDB);
+                        /*
+                         * 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");
+                        if (PEAR::isError($DBRESULT))
+                                print "AddSvcComment - RQ1 - Mysql Error : ".$DBRESULT->getMessage();
+                        while ($host =& $DBRESULT->fetchRow()){
+                                if (!$host["host_name"])
+                                        $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
+                                if (isset($lcaHostByName["LcaHost"][$host["host_name"]]) || $is_admin)
+                                        $hosts[$host["host_id"]]= $host["host_name"];
+                        }
+                        $DBRESULT->free();
+                
+                        $services = array();
+                        if (isset($host_id))
+                                $services = getMyHostServices($host_id);
+                
+                        $debug = 0;
+                        $attrsTextI             = array("size"=>"3");
+                        $attrsText              = array("size"=>"30");
+                        $attrsTextarea  = array("rows"=>"7", "cols"=>"100");
+                
+                        #
+                        ## Form begin
+                        #
                         
-        isset($_GET["host_id"]) ? $cG = $_GET["host_id"] : $cG = NULL;
-        isset($_POST["host_id"]) ? $cP = $_POST["host_id"] : $cP = NULL;        
-        $cG ? $host_id = $cG : $host_id = $cP;
-        
-        if (isset($_GET["host_name"]) && isset($_GET["service_description"])){
-                $host_id = getMyHostID($_GET["host_name"]);
-                if (!$is_admin && !isset($lcaHostByName["LcaHost"][$_GET["host_name"]]))
-                        $LCA_error = 1;
-                $service_id = getMyServiceID($_GET["service_description"], $host_id);
-                $host_name = $_GET["host_name"];
-                $svc_description = $_GET["service_description"];
-        } else  {
-                $host_name = NULL;
-                $svc_description = NULL;
-        }
-        
-        if ($LCA_error)
+                        $form = new HTML_QuickForm('Form', 'post', "?p=".$p);
+                        $form->addElement('header', 'title', _("Add a comment for Service"));
+                        
+                        #
+                        ## Indicator basic information
+                        #
+                        
+                        $redirect =& $form->addElement('hidden', 'o');
+                        $redirect->setValue($o);
+                    
+                    $selHost =& $form->addElement('select', 'host_id', _("Host Name"), $hosts, array("onChange" =>"this.form.submit();"));
+                        $selSv =& $form->addElement('select', 'service_id', _("Services"), $services);
+                    $form->addElement('checkbox', 'persistant', _("Persistent"));
+                        $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
+                        
+                        /*
+                         * Add Rules
+                         */
+                        $form->addRule('host_id', _("Required Field"), 'required');
+                        $form->addRule('service_id', _("Required Field"), 'required');
+                        $form->addRule('comment', _("Required Field"), 'required');     
+                        
+                        $subA =& $form->addElement('submit', 'submitA', _("Save"));
+                        $res =& $form->addElement('reset', 'reset', _("Reset"));
+                        
+                        $form->setDefaults($data);
+                  
+                        $valid = false;
+                        if ((isset($_POST["submitA"]) && $_POST["submitA"]) && $form->validate())       {
+                                if (!isset($_POST["persistant"]))
+                                        $_POST["persistant"] = 0;
+                                if (!isset($_POST["comment"]))
+                                        $_POST["comment"] = 0;
+                                AddSvcComment($_POST["host_id"], $_POST["service_id"], $_POST["comment"], $_POST["persistant"]);
+                                $valid = true;
+                        require_once($path."viewComment.php");
+                        } else {
+                                # Smarty template Init
+                                $tpl = new Smarty();
+                                $tpl = initSmartyTpl($path, $tpl, "template/");
+                                        
+                                #Apply a template definition    
+                                $renderer =& new HTML_QuickForm_Renderer_ArraySmarty($tpl);
+                                $renderer->setRequiredTemplate('{$label}&nbsp;<font color="red" size="1">*</font>');
+                                $renderer->setErrorTemplate('<font color="red">{$error}</font><br />{$html}');
+                                $form->accept($renderer);       
+                                
+                                $tpl->assign('form', $renderer->toArray());     
+                                $tpl->assign('o', $o);          
+                                $tpl->display("AddSvcComment.ihtml");
+                    }
+                }
+        } else {
                 require_once("./alt_error.php");
-        else {
-                $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
-                 */
-                $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");
-                if (PEAR::isError($DBRESULT))
-                        print "AddSvcComment - RQ1 - Mysql Error : ".$DBRESULT->getMessage();
-                while ($host =& $DBRESULT->fetchRow()){
-                        if (!$host["host_name"])
-                                $host["host_name"] = getMyHostName($host["host_template_model_htm_id"]);
-                        if (isset($lcaHostByName["LcaHost"][$host["host_name"]]) || $is_admin)
-                                $hosts[$host["host_id"]]= $host["host_name"];
-                }
-                $DBRESULT->free();
-        
-                $services = array();
-                if (isset($host_id))
-                        $services = getMyHostServices($host_id);
-        
-                $debug = 0;
-                $attrsTextI             = array("size"=>"3");
-                $attrsText              = array("size"=>"30");
-                $attrsTextarea  = array("rows"=>"7", "cols"=>"100");
-        
-                #
-                ## Form begin
-                #
-                
-                $form = new HTML_QuickForm('Form', 'post', "?p=".$p);
-                $form->addElement('header', 'title', _("Add a comment for Service"));
-                
-                #
-                ## Indicator basic information
-                #
-                
-                $redirect =& $form->addElement('hidden', 'o');
-                $redirect->setValue($o);
-            
-            $selHost =& $form->addElement('select', 'host_id', _("Host Name"), $hosts, array("onChange" =>"this.form.submit();"));
-                $selSv =& $form->addElement('select', 'service_id', _("Services"), $services);
-            $form->addElement('checkbox', 'persistant', _("Persistent"));
-                $form->addElement('textarea', 'comment', _("Comments"), $attrsTextarea);
-                
-                /*
-                 * Add Rules
-                 */
-                $form->addRule('host_id', _("Required Field"), 'required');
-                $form->addRule('service_id', _("Required Field"), 'required');
-                $form->addRule('comment', _("Required Field"), 'required');     
-                
-                $subA =& $form->addElement('submit', 'submitA', _("Save"));
-                $res =& $form->addElement('reset', 'reset', _("Reset"));
-                
-                $form->setDefaults($data);
-          
-                $valid = false;
-                if ((isset($_POST["submitA"]) && $_POST["submitA"]) && $form->validate())       {
-                        if (!isset($_POST["persistant"]))
-                                $_POST["persistant"] = 0;
-                        if (!isset($_POST["comment"]))
-                                $_POST["comment"] = 0;
-                        AddSvcComment($_POST["host_id"], $_POST["service_id"], $_POST["comment"], $_POST["persistant"]);
-                        $valid = true;
-                require_once($path."viewComment.php");
-                } else {
-                        # Smarty template Init
-                        $tpl = new Smarty();
-                        $tpl = initSmartyTpl($path, $tpl, "template/");
-                                
-                        #Apply a template definition    
-                        $renderer =& new HTML_QuickForm_Renderer_ArraySmarty($tpl);
-                        $renderer->setRequiredTemplate('{$label}&nbsp;<font color="red" size="1">*</font>');
-                        $renderer->setErrorTemplate('<font color="red">{$error}</font><br />{$html}');
-                        $form->accept($renderer);       
-                        
-                        $tpl->assign('form', $renderer->toArray());     
-                        $tpl->assign('o', $o);          
-                        $tpl->display("AddSvcComment.ihtml");
-            }
         }
 ?>

trunk/centreon/www/include/monitoring/comments/template/comments.ihtml

@@ -2 +2 @@
         <form action="" method='GET'>
         <hidden name="p" value='{$p}'>
-        <table class="ListTable"><tr class='ListHeader'><td>&nbsp;<img src='./img/icones/16x16/messages.gif'>&nbsp;{$cmt_host_comment}</td>{if !$nb_comments_host}<td align='right'><a href="{$msgh.addL}">{$msgh.addT}</a></td>{/if}</tr></table><br />
+        <table class="ListTable"><tr class='ListHeader'><td>&nbsp;<img src='./img/icones/16x16/messages.gif'>&nbsp;{$cmt_host_comment}</td>{if !$nb_comments_host}<td align='right'>{if $msgh}<a href="{$msgh.addL}">{$msgh.addT}{/if}</a></td>{/if}</tr></table><br />
         {if $nb_comments_host}
         <table class="ListTable">
@@ -35 +35 @@
         </form>
         <br><br>
-        <table class="ListTable"><tr class='ListHeader'><td>&nbsp;<img src='./img/icones/16x16/messages.gif'>&nbsp;{$cmt_service_comment}</td>{if !$nb_comments_svc}<td align='right'><a href="{$msgs.addL}">{$msgs.addT}</a></td>{/if}</tr></table><br />
+        <table class="ListTable"><tr class='ListHeader'><td>&nbsp;<img src='./img/icones/16x16/messages.gif'>&nbsp;{$cmt_service_comment}</td>{if !$nb_comments_svc}<td align='right'>{if $msgs}<a href="{$msgs.addL}">{$msgs.addT}</a>{/if}</td>{/if}</tr></table><br />
         {if $nb_comments_svc} 
         <form action="" method='GET'>

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

@@ -17 +17 @@
         if (!isset($oreon))
                 exit();
+
+        /*
+         * ACL Actions
+         */
+        $GroupListofUser = array();
+        $GroupListofUser =  getGroupListofUser($pearDB);
+        
+        $allActions = false;
+        if(count($GroupListofUser) > 0 && isUserAdmin($pearDB) == 1) {
+        $authorized_actions = array();
+        $authorized_actions = getActionsACLList($GroupListofUser);
+        }
+        else {
+                $allActions = true;
+        }
 
         # LCA
@@ -99 +114 @@
         $tab = array ("p" => $p);
         $form->setDefaults($tab);
-
-        $tpl->assign('msgh', array ("addL"=>"?p=".$p."&o=ah", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));
-        $tpl->assign('msgs', array ("addL"=>"?p=".$p."&o=as", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));
+        
+        if(isset($authorized_actions) && $allActions == false){         
+                foreach($authorized_actions as $action_name) {
+                        if($action_name == "host_comment") $tpl->assign('msgh', array ("addL"=>"?p=".$p."&o=ah", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));
+                        if($action_name == "service_comment") $tpl->assign('msgs', array ("addL"=>"?p=".$p."&o=as", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));
+                }
+        } else {
+                $tpl->assign('msgh', array ("addL"=>"?p=".$p."&o=ah", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));
+                $tpl->assign('msgs', array ("addL"=>"?p=".$p."&o=as", "addT"=>_("Add"), "delConfirm"=>_("Do you confirm the deletion ?")));             
+        }
+        
         $tpl->assign("p", $p);
         $tpl->assign("tab_comments_host", $tab_comments_host);