From b15ee4cef6f268a1854a17cfd3b79f98d8e6e246 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 2 Dec 2005 08:20:07 +0000 Subject: [PATCH] Finished acl stuff for conferences git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2199 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/gofon/conference/class_phoneConferenceManagment.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index 1264796f2..bbde58faf 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -346,8 +346,8 @@ class phoneConferenceManagment extends plugin /* Insert conferneces*/ foreach($this->conferences as $conferencekey => $conference ){ - - if((isset($conference['goFonPIN'][0]))&&($this->ui->dn==$conference['goFonConferenceOwner'][0])){ + + if((isset($conference['goFonPIN'][0]))&&(($this->ui->dn==$conference['goFonConferenceOwner'][0])||($this->acl=="#all#"))){ $pin = "PIN"; }else{ $pin = " "; @@ -366,7 +366,7 @@ class phoneConferenceManagment extends plugin $a_field1 = array("string"=>sprintf($userimg,_("Conference")), "attach" => "style='text-align:center;width:20px;'"); - if(($this->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->acl,"goFonConferenceOwner")=="")){ + if(($this->acl=="#all#")||(($this->ui->dn==$conference['goFonConferenceOwner'][0])&&(chkacl($this->acl,"goFonConferenceOwner")==""))){ $a_field2 = array("string"=>sprintf($editlink,$conferencekey,$conference['cn'][0].$number), "attach" => "style=''"); }else{ $a_field2 = array("string"=>$conference['cn'][0].$number, "attach" => "style=''"); -- 2.30.2