Updated nagios ACLs.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11628 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
index d434ec4e42269d770d9a42401c66082823c2ba13..0d50aac78649ad2bc793839f85817a720696c18d 100644 (file)
--- a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
+++ b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc
@@ -282,26 +282,23 @@ class nagiosAccount extends plugin
           "plProvidedAcls"  => array(
 
             "NagiosAlias"                       =>  _("Alias"),
-            "NagiosPager"                       =>  _("Pager number"),
             "NagiosMail"                        =>  _("Mail address"),
-
-            "HostNotificationCommands"          =>  _("Host notification commands"),
-            "HostNotificationOptions"           =>  _("Host notification options"),
             "HostNotificationPeriod"            =>  _("Host notification period"),
-
-            "ServiceNotificationCommands"       =>  _("Service notification commands"),
-            "ServiceNotificationOptions"        =>  _("Service notification options"),
             "ServiceNotificationPeriod"         =>  _("Service notification period"),
+            "HostNotificationOptions"           =>  _("Host notification options"),
+            "ServiceNotificationOptions"        =>  _("Service notification options"),
+            "NagiosPager"                       =>  _("Pager number"),
 
-            "AuthorizedAllHosts"                =>  _("View all hosts"),
-            "AuthorizedAllServices"             =>  _("View all services"),
-
+            "ServiceNotificationCommands"       =>  _("Service notification commands"),
+            "HostNotificationCommands"          =>  _("Host notification commands"),
+            "AuthorizedSystemInformation"       =>  _("View system informations"),
+            "AuthorizedConfigurationInformation"=>  _("View configuration information"),
             "AuthorizedSystemCommands"          =>  _("Trigger system commands"),
-            "AuthorizedAllHostCommands"         =>  _("Trigger all host commands"),
+            "AuthorizedAllServices"             =>  _("View all services"),
+            "AuthorizedAllHosts"                =>  _("View all hosts"),
             "AuthorizedAllServiceCommands"      =>  _("Trigger all service commands"),
+            "AuthorizedAllHostCommands"         =>  _("Trigger all host commands"))
 
-            "AuthorizedConfigurationInformation"=>  _("View configuration information"),
-            "AuthorizedSystemInformation"       =>  _("View system informations"))
       ));
   }
 }

diff --git a/gosa-plugins/nagios/personal/nagios/main.inc b/gosa-plugins/nagios/personal/nagios/main.inc
index a564dd77ff43fcae80353c1854fe70fa61b4a927..5130941c0eb23e8c592a514e15cbe8aa67c622fa 100644 (file)
--- a/gosa-plugins/nagios/personal/nagios/main.inc
+++ b/gosa-plugins/nagios/personal/nagios/main.inc
@@ -111,7 +111,7 @@ if (!$remove_lock){
       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/unlocked.png').
              "\"> ".$ui->dn."&nbsp;";
 
-      if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/nagiosAccount"))){
+      if(preg_match("/r/",$ui->get_permissions($ui->dn,"users/nagiosAccount"))){
         $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png').
           "\"> ".msgPool::clickEditToChange();
         $display.= "<input type=submit name=\"edit\" value=\"".msgPool::editButton()."\">\n";
@@ -122,7 +122,7 @@ if (!$remove_lock){
   }
 
   /* Page header*/
-  $display= print_header(get_template_path('images/monitoring.png'), _("Nagios settings"), $info).$display;
+  $display= print_header(get_template_path('plugins/nagios/images/plugin.png'), _("Nagios settings"), $info).$display;
 
 }