Fixed fax acls

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

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index 4a03aec4512f97bf551f7950fed6ff8a84136973..9cb8958be8b472abd1b6abf58363d435770a17c3 100644 (file)
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -567,7 +567,7 @@ class blocklist extends plugin
 
           "plPriority"    => 0,
           "plSection"     => array("administration" => _("FAX Blocklists")),
-          "plCategory"    => array("blocklists"     => array("description" => _("Blocklists"),
+          "plCategory"    => array("gofax"          => array("description" => _("Fax"),
                                                              "objectClass" => array("goFaxRBlock","goFaxSBlock"))),
       
   

diff --git a/plugins/gofax/faxreports/class_faxreport.inc b/plugins/gofax/faxreports/class_faxreport.inc
index 47bc4d79eef2cb0156e29805c711c12cf88e4848..a666aaf4a784e8314be03804a2df2fe56394d0fe 100644 (file)
--- a/plugins/gofax/faxreports/class_faxreport.inc
+++ b/plugins/gofax/faxreports/class_faxreport.inc
@@ -382,14 +382,17 @@ class faxreport extends plugin
     #FIXME You can only read attributes within this report plugin */
   function plInfo()
   {
+
+  
+  
     return (array(
           "plShortName"     => _("Fax report"),
           "plDescription"   => _("Fax report"),
           "plSelfModify"    => TRUE,
           "plDepends"       => array(),
           "plPriority"      => 1,                                 // Position in tabs
-          "plSection"       => "FAX Reports",                     // This belongs to personal
-          "plCategory"      => array("fax"),
+          "plSection"       => array("administration"),                     // This belongs to personal
+          "plCategory"      => array("gofax"),
           "plOptions"       => array(),
 
           "plProvidedAcls" => array(

diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index 15714c8d10b1bfc903348d0df989e9242b4f61d1..bd19a69dc9353adc23cd782c0901a65ade1e547d 100644 (file)
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -512,8 +512,15 @@ class user extends plugin
       $smarty->assign("governmentmode", "false");
     }
 
+    /* Special mode for uid */
     $uidACL= $ui->get_permissions($this->dn,"user", "uid");
-    $uidACL= preg_replace("/w/","",$uidACL);
+    if (isset ($this->dn)){
+      if ($this->dn != "new"){
+        $uidACL= preg_replace("/w/","",$uidACL);
+      }
+    }  else {
+      $uidACL= preg_replace("/w/","",$uidACL);
+    }
     
     $smarty->assign("uidACL", $uidACL);
     $smarty->assign("is_template", $this->is_template);