From: cajus Date: Fri, 14 Jul 2006 05:58:09 +0000 (+0000) Subject: Updated ACL class to have per object r/w X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e5d302f96cb1150631a2442cac241ea148a94eba;p=gosa.git Updated ACL class to have per object r/w git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4145 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/include/class_acl.inc b/include/class_acl.inc index 89d443ab5..8cdfe5430 100644 --- a/include/class_acl.inc +++ b/include/class_acl.inc @@ -450,7 +450,7 @@ class acl extends plugin $currentAcl= $this->aclContents[$key]; /* Object header */ - $display.= ""; + $display.= "
"._("Object").": $name
"; /* Generate options */ $spc= "  "; @@ -469,7 +469,11 @@ class acl extends plugin } } - $display.= ""; + /* Global options */ + $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])).$spc; + + $display.= ""; /* Walk through the list of attributes */ $cnt= 1; @@ -507,8 +511,8 @@ class acl extends plugin } /* Fill missing td's if needed */ - if (--$cnt != $cols){ - $display.= str_repeat("", $cols-$cnt); + if (--$cnt != $cols && $cnt != 0){ + $display.= str_repeat("", $cols-$cnt); } $display.= "
"._("Object").": $name
$options
$options ".("Complete object:")." $more_options
  

"; @@ -787,7 +791,6 @@ class acl extends plugin function remove_from_parent() { - echo "remove_from_parent() called"; } }