X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_acl.inc;h=dec421bec554a299818248ac8a34567b071c4ee5;hb=55b59c255ff60a8fc2723196efe6b412580327cd;hp=8103ba16e8e4a756dfbf215a447f9113d656eeef;hpb=9a7a2ec9cf7dad5bbef318ccb13f293ea6b27b0d;p=gosa.git diff --git a/include/class_acl.inc b/include/class_acl.inc index 8103ba16e..dec421bec 100644 --- a/include/class_acl.inc +++ b/include/class_acl.inc @@ -27,7 +27,6 @@ class acl extends plugin var $currentIndex= 0; var $wasNewEntry= FALSE; var $ocMapping= array(); - var $multiClass= array(); var $savedAclContents= array(); @@ -107,11 +106,6 @@ class acl extends plugin /* Only feed categories */ if (isset($acls['plCategory'])){ - /* Find multi homed classes */ - if (count($acls['plCategory']) > 1){ - $this->multiClass[$class]= $class; - } - /* Walk through supplied list and feed only translated categories */ foreach($acls['plCategory'] as $idx => $data){ @@ -134,21 +128,13 @@ class acl extends plugin if (is_array($data['objectClass'])){ foreach($data['objectClass'] as $objectClass){ if (in_array_ics($objectClass, $oc)){ - if (isset($this->multiClass[$class])){ - $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription']; - } else { - $this->myAclObjects[$class]= $acls['plDescription']; - } + $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription']; break; } } } else { if (in_array_ics($data['objectClass'], $oc)){ - if (isset($this->multiClass[$class])){ - $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription']; - } else { - $this->myAclObjects[$class]= $acls['plDescription']; - } + $this->myAclObjects[$idx.'/'.$class]= $acls['plDescription']; } } } @@ -156,6 +142,8 @@ class acl extends plugin } } } + $this->aclObjects['all']= '* '._("All categories"); + $this->ocMapping['all']= array('0' => 'all'); /* Sort categories */ asort($this->aclObjects); @@ -227,7 +215,7 @@ class acl extends plugin if (preg_match('/^cat_del_.*_x/', $name)){ $idx= preg_replace('/^cat_del_([^_]+)_.*$/', '\1', $name); foreach ($this->ocMapping[$idx] as $key){ - unset($this->aclContents[$key]); + unset($this->aclContents["$idx/$key"]); } continue; } @@ -257,6 +245,11 @@ class acl extends plugin $aclDialog= TRUE; list($dummy, $object, $attribute, $value)= split('_', $name); + /* Skip for detection entry */ + if ($object == 'dummy') { + continue; + } + /* Ordinary ACLs */ if (!isset($new_acl[$object])){ $new_acl[$object]= array(); @@ -270,7 +263,8 @@ class acl extends plugin } /* Only be interested in new acl's, if we're in the right _POST place */ - if ($aclDialog && isset($this->ocMapping[$this->aclObject])){ + if ($aclDialog && is_array($this->ocMapping[$this->aclObject])){ + foreach ($this->ocMapping[$this->aclObject] as $oc){ unset($this->aclContents[$oc]); unset($this->aclContents[$this->aclObject.'/'.$oc]); @@ -376,7 +370,7 @@ class acl extends plugin $action.= ""; $action.= ""; - $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px';text-align:right"); + $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px;text-align:right;'"); $aclList->AddEntry(array($field1, $field2, $field3)); } @@ -461,16 +455,14 @@ class acl extends plugin $smarty->assign('headline', sprintf(_("Edit ACL for '%s', scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType])); /* Collect objects for selected category */ - $aclObjects= array(); foreach ($this->ocMapping[$this->aclObject] as $idx => $class){ if ($idx == 0){ continue; } - if (isset($this->multiClass[$class])){ - $aclObjects[$this->aclObject.'/'.$class]= $plist[$class]['plDescription']; - } else { - $aclObjects[$class]= $plist[$class]['plDescription']; - } + $aclObjects[$this->aclObject.'/'.$class]= $plist[$class]['plDescription']; + } + if ($this->aclObject == 'all'){ + $aclObjects['all']= _("All objects in current subtree"); } $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects)); } @@ -481,16 +473,39 @@ class acl extends plugin return ($smarty->fetch (get_template_path('acl.tpl'))); } - + function sort_by_priority($list) + { + $tmp= get_global('plist'); + $plist= $tmp->info; + asort($plist); + + foreach($list as $name => $translation){ + $na = preg_replace("/^.*\//","",$name); + $prio= $plist[$na]['plPriority'] ; + + $newSort[$name] = $prio; + } + + asort($newSort); + + $ret = array(); + foreach($newSort as $name => $prio){ + $ret[$name] = $list[$name]; + } + return($ret); + } + function buildAclSelector($list) { - $display= ""; + $display= ""; $cols= 3; $tmp= get_global('plist'); $plist= $tmp->info; asort($plist); /* Build general objects */ + + $list =$this->sort_by_priority($list); foreach ($list as $key => $name){ /* Create sub acl if it does not exist */ @@ -501,7 +516,33 @@ class acl extends plugin $currentAcl= $this->aclContents[$key]; /* Object header */ - $display.= ""; + if($_SESSION['js']) { + if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) { + $display.= "\n
"._("Object").": $name
". + "\n ". + "\n ". + "\n ". + "\n "; + } else if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/ie/i",$_SERVER['HTTP_USER_AGENT'])) { + $display.= "\n
"._("Object").": $name". + "\n
". + "\n ". + "\n ". + "\n ". + "\n "; + } else { + $display.= "\n
"._("Object").": $name". + "\n
". + "\n ". + "\n ". + "\n "; + } + } else { + $display.= "\n
"._("Object").": $name
". + "\n ". + "\n ". + "\n "; + } /* Generate options */ $spc= "  "; @@ -524,12 +565,28 @@ class acl extends plugin $more_options= $this->mkchkbx($key."_0_r", _("read"), preg_match('/r/', $currentAcl[0])).$spc; $more_options.= $this->mkchkbx($key."_0_w", _("write"), preg_match('/w/', $currentAcl[0])); - $display.= ""; + $display.= "\n ". + "\n ". + "\n ". + "\n "; /* Walk through the list of attributes */ $cnt= 1; $splist= $plist[preg_replace('%^.*/%', '', $key)]['plProvidedAcls']; asort($splist); + if($_SESSION['js']) { + if(isset($_SERVER['HTTP_USER_AGENT']) && preg_match("/gecko/i",$_SERVER['HTTP_USER_AGENT'])) { + $display.= "\n ". + "\n
"._("Object").": $name
$options ".("Complete object:")." $more_options
$options ".("Complete object:")." $more_options
". + "\n

\n"; } return ($display); @@ -576,7 +643,8 @@ class acl extends plugin function mkchkbx($name, $text, $state= FALSE) { $state= $state?"checked":""; - return ""; + return "\n ". + "\n "; } @@ -584,8 +652,10 @@ class acl extends plugin { $rstate= preg_match('/r/', $state)?'checked':''; $wstate= preg_match('/w/', $state)?'checked':''; - return ("". - ""); + return ("\n ". + "\n ". + "\n ". + "\n "); }