diff --git a/plugins/personal/environment/class_environment.inc b/plugins/personal/environment/class_environment.inc
index 16e1c71575d83c28ad721232c19225cc20121760..ab12080b1870a6ebabe5482e4f8b9df91f4dd591 100644 (file)
"640x480" => "640x480",
"800x600" => "800x600",
"1024x768" => "1024x768",
- "1154x864" => "1154x864",
+ "1152x864" => "1152x864",
"1280x768" => "1280x768",
"1280x1024" => "1280x1024");
}
/* Prepare ACL settings*/
- if(chkacl($this->acl,$s_attr)=="") {
- $smarty->assign($s_attr."ACL","");
- }else{
- $smarty->assign($s_attr."ACL"," disabled ");
- }
-
+ $smarty->assign($s_attr."ACL",$this->getacl($s_attr));
}
/* Is accout enabled | are we editing from usermenu or admin menu
}
/* Prepare ACL settings*/
- if(chkacl($this->acl,$s_attr)=="") {
- $smarty->assign($s_attr."ACL","");
- }else{
- $smarty->assign($s_attr."ACL"," disabled ");
- }
+ $smarty->assign($s_attr."ACL",$this->getacl($s_attr));
}
- foreach(array("gotoHotplugDevice","gotoPrinterSel") as $s_attr){
- if(chkacl($this->acl,$s_attr)=="") {
- $smarty->assign($s_attr."ACL","");
- }else{
- $smarty->assign($s_attr."ACL"," disabled ");
- }
+ foreach(array("gotoHotplugDevice","gotoProfileFlagC","gotoProfileFlagL") as $s_attr){
+ $smarty->assign($s_attr."ACL",$this->getacl($s_attr));
}
if(empty($this->useProfile)){
- $smarty->assign("gotoProfileACL","disabled");
$smarty->assign("useProfileCHK","");
+ $smarty->assign("gotoProfileServerACL" , preg_replace("/w/","",$this->getacl("gotoProfileServer")));
+ $smarty->assign("gotoProfileQuotaACL" , preg_replace("/w/","",$this->getacl("gotoProfileQuota")));
+ $smarty->assign("gotoProfileFlagCACL" , preg_replace("/w/","",$this->getacl("gotoProfileFlagC")));
}else{
- $smarty->assign("gotoProfileACL","");
$smarty->assign("useProfileCHK"," checked ");
}
-
-
- $smarty->assign("useProfileACL","");
- if($this->acl != "#none#"){
- $smarty->assign("useProfileACL","");
- $smarty->assign("gotoProfileFlagCACL"," ");
- $smarty->assign("gotoProfileQuotaACL"," ");
- }else{
- $smarty->assign("gotoProfileFlagCACL"," disabled ");
- $smarty->assign("useProfileACL","disabled");
- $smarty->assign("gotoProfileServer"," disabled ");
- $smarty->assign("gotoProfileQuotaACL"," disabled ");
- }
+
+
+ $smarty->assign("gotoProfileACL", $this->getacl("gotoProfileServer").$this->getacl("gotoProfileQuota"));
/* HANDLE Profile Settings here
* Assign available Quota and resolution settings
}
return($disp);
}
- if($this->acl != "#none#"){
- $smarty->assign("useProfileACL","");
- }else{
- $smarty->assign("gotoProfileFlagCACL"," disabled ");
- $smarty->assign("gotoProfileServerACL"," disabled ");
- $smarty->assign("gotoProfileQuotaACL"," disabled ");
- }
-
- if(!$this->useProfile){
- $smarty->assign("gotoProfileFlagCACL"," disabled ");
- $smarty->assign("gotoProfileServerACL"," disabled ");
- $smarty->assign("gotoProfileQuotaACL"," disabled ");
- }
/* Als smarty vars are set. Get smarty template and generate output */
$display.= $smarty->fetch(get_template_path('environment.tpl', TRUE,dirname(__FILE__)));
}
}
-
- /* Save usersettings to Printer */
- if(chkacl($this->acl,"gotoPrinter")!=""){
- $this->gotoPrinter = array();
- }
-
/* 1. Search all printers that have our uid/cn as member
* 2. Delete this uid/cn from every single entry and save it again.
* 2.1 There are different types of members: Users / Groups, this will be defined in $suffix
$this->attrs['gotoProfileServer']= array();
}
- foreach($this->attributes as $s_attr){
- if(chkacl($this->acl,$s_attr)!="") {
- if(isset($this->attrs[$s_attr])){
- unset($this->attrs[$s_attr]);
- }
- }
- }
-
$ldap->cat ($this->dn, array('dn'));
if ($ldap->fetch()){
$mode= "modify";