From: hickert Date: Tue, 27 May 2008 12:56:52 +0000 (+0000) Subject: Updated conference action acls X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=36824ef28ba4ef779beecde850c214f3d8a86b3f;p=gosa.git Updated conference action acls git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11038 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc index 4f2387e77..0c10b8257 100644 --- a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc +++ b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc @@ -134,39 +134,41 @@ class divListConference extends MultiSelectWindow /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". - " "._("Create")."|\n"; /* Append create options */ if(preg_match("/(c.*w|w.*c)/",$acl_all)){ + $s .= "..|". + " "._("Create")."|\n"; $s.= "...|". " "._("Conference")."|conference_new|\n"; + $s.= "..|---|\n"; } /* Multiple options */ - $s.= "..|---|\n"; $s.= "..|". " "._("Remove")."|"."remove_multiple|\n"; - /* Add multiple copy & cut icons */ - if(is_object($this->parent->CopyPasteHandler)){ + if(is_object($this->parent->CopyPasteHandler) && preg_match("/r/",$acl_all)){ $s.= "..|---|\n"; $s.= "..|". " "._("Copy")."|"."multiple_copy_systems|\n"; - $s.= "..|". - " "._("Cut")."|"."multiple_cut_systems|\n"; - - if($this->parent->CopyPasteHandler->entries_queued()){ - $img = ""; - $s.="..|".$img." "._("Paste")."|editPaste|\n"; - }else{ - $img = ""; - $s.="..|".$img." "._("Paste")."\n"; + if(is_object($this->parent->CopyPasteHandler) && preg_match("/(r.*d|d.*r)/",$acl_all)){ + $s.= "..|". + " "._("Cut")."|"."multiple_cut_systems|\n"; } } + /* Copy & paste icons */ + if(is_object($this->parent->CopyPasteHandler) && $this->parent->CopyPasteHandler->entries_queued()){ + $img = ""; + $s.="..|".$img." "._("Paste")."|editPaste|\n"; + }else{ + $img = ""; + $s.="..|".$img." "._("Paste")."\n"; + } + /* Add snapshot icons */ - if(preg_match("/(c.*w|w.*c)/",$acls)){ + if(preg_match("/(c.*w|w.*c)/",$acl_all)){ $s .= "..|---|\n"; $s .= $this->get_snapshot_header(TRUE); } @@ -207,20 +209,31 @@ class divListConference extends MultiSelectWindow } $actions =""; - if(($this->parent->CopyPasteHandler) && preg_match("/(c.*w|w.*c)/",$acl_all)){ - $actions.= "parent->CopyPasteHandler){ + $actions .= " "; + }else{ + $actions.="  "; + } + + if(preg_match("/r/",$acl_all) && $this->parent->CopyPasteHandler){ $actions.= " "; + }else{ + $actions.="  "; } /* Add edit icon - This is allowed when we have at least read access. */ $actions.= ""; - /* Add snapshot icon - This is allowed when we have create and write access for the current entry */ - if(preg_match("/(c.*w|w.*c)/",$acl_all)){ + /* Add snapshot icon */ + if(preg_match("/(r.*w|w.*r)/",$acl_all)){ $actions.= $this->GetSnapShotActions($conference['dn']); + }else{ + $actions.="  "; + $actions.="  "; } /* Create delete link - Only if we are allowed to delete this entry */