From: hickert Date: Fri, 12 Jan 2007 04:49:56 +0000 (+0000) Subject: Updated printer acls X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0be8dca2456421d30ff905a25b433cca9d46ca9f;p=gosa.git Updated printer acls git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5545 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index bef4941b2..d0f2cebf5 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -338,7 +338,7 @@ class printgeneric extends plugin /* Base select dialog */ $once = true; foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once){ + if(preg_match("/^chooseBase/",$name) && $once && chkacl($this->acl,"base")){ $once = false; $this->dialog = new baseSelectDialog($this->config); $this->dialog->setCurrentBase($this->base); @@ -377,21 +377,21 @@ class printgeneric extends plugin $smarty->assign("baseACL", chkacl($this->acl,"base")); - if(isset($_POST['AddUser'])){ + if(isset($_POST['AddUser']) && chkacl($this->acl,"gotoUserPrinter") == ""){ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddUser"); } - if(isset($_POST['AddGroup'])){ + if(isset($_POST['AddGroup']) && chkacl($this->acl,"gotoGroupPrinter") == ""){ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddGroup"); } - if(isset($_POST['AddAdminUser'])){ + if(isset($_POST['AddAdminUser']) && chkacl($this->acl,"gotoUserAdminPrinter") == ""){ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminUser"); } - if(isset($_POST['AddAdminGroup'])){ + if(isset($_POST['AddAdminGroup']) && chkacl($this->acl,"gotoGroupAdminPrinter") == ""){ $this->dialog = new selectUserToPrinterDialog($this->config, NULL,"AddAdminGroup"); } /* Display ppd configure/select dialog */ - if(isset($_POST['EditDriver'])){ + if(isset($_POST['EditDriver']) && chkacl($this->acl,"gotoPrinterPPD")==""){ if($this->PPDdialogToSave){ $this->dialog = $this->PPDdialogToSave; }else{ @@ -400,7 +400,7 @@ class printgeneric extends plugin } /* remove ppd */ - if(isset($_POST['RemoveDriver'])){ + if(isset($_POST['RemoveDriver']) && chkacl($this->acl,"gotoPrinterPPD")==""){ $this->gotoPrinterPPD = array(); $this->PPDdialogToSave = NULL; } @@ -428,25 +428,25 @@ class printgeneric extends plugin } /* Member management, delete user / group / admin ..*/ - if((isset($_POST['DelUser']))&&(isset($_POST['UserMember']))){ + if((isset($_POST['DelUser']))&&(isset($_POST['UserMember'])) && chkacl($this->acl,"gotoUserPrinter")==""){ foreach($_POST['UserMember'] as $mem){ $this->DelMember('AddUser',$mem); } } - if((isset($_POST['DelUser']))&&(isset($_POST['UserMember']))){ + if((isset($_POST['DelUser']))&&(isset($_POST['UserMember'])) && chkacl($this->acl,"gotoGroupPrinter")==""){ foreach($_POST['UserMember'] as $mem){ $this->DelMember('AddGroup',$mem); } } - if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember']))){ + if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember'])) && chkacl($this->acl,"gotoUserAdminPrinter")==""){ foreach($_POST['AdminMember'] as $mem){ $this->DelMember('AddAdminUser',$mem); } } - if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember']))){ + if((isset($_POST['DelAdmin']))&&(isset($_POST['AdminMember'])) && chkacl($this->acl,"gotoGroupAdminPrinter")==""){ foreach($_POST['AdminMember'] as $mem){ $this->DelMember('AddAdminGroup',$mem); } diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc index 47287a897..3852df8a3 100644 --- a/plugins/admin/systems/class_termDNS.inc +++ b/plugins/admin/systems/class_termDNS.inc @@ -462,14 +462,14 @@ class termDNS extends plugin $str.=" ". " ".$this->generateRecordListBox($entry['type'],"RecordTypeSelectedFor_".$key)."". - " ". - " ". + " acl,"termDNS")." type='text' value='".$entry['value']."' name='RecordValue_".$key."' id='RecordValue_".$key."'>". + " acl,"termDNS")." type='submit' name='RemoveRecord_".$key."' value='"._("Delete")."' id='RemoveRecord_".$key."'>". ""; } $str.= " ". " ". - " ". + " acl,"termDNS")." >". " ". " ". ""; @@ -482,7 +482,7 @@ class termDNS extends plugin */ function generateRecordListBox($selected,$name) { - $str = "acl,"termDNS")." name='".$name."' id='".$name."'>"; foreach($this->RecordTypes as $type => $value){ $use = ""; if($type == $selected){ diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl index 49ed25737..0578027d1 100644 --- a/plugins/admin/systems/printer.tpl +++ b/plugins/admin/systems/printer.tpl @@ -11,7 +11,7 @@ - +   @@ -37,11 +37,11 @@ - + - +
{$must}
@@ -49,8 +49,8 @@

{t}Driver{/t}: {$driverInfo}  - - + +
@@ -68,12 +68,14 @@ {t}Users which are allowed to use this printer{/t}
- {html_options options=$UserMembers values=$UserMemberKeys}
- - - + + + @@ -84,12 +86,14 @@ {t}Users which are allowed to administrate this printer{/t}
- {html_options options=$AdminMembers values=$AdminMemberKeys}
- - - + + +