From 3f588a4c5a57546dab60715842bff60b229d7446 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 18 Jul 2006 09:15:03 +0000 Subject: [PATCH] Fixed fax acls git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4202 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/gofax/blocklists/class_blocklistManagement.inc | 2 +- plugins/gofax/faxreports/class_faxreport.inc | 7 +++++-- plugins/personal/generic/class_user.inc | 9 ++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index 4a03aec45..9cb8958be 100644 --- 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 47bc4d79e..a666aaf4a 100644 --- 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 15714c8d1..bd19a69dc 100644 --- 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); -- 2.30.2