Code

Next load of acl changes
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 11 Jul 2006 09:53:44 +0000 (09:53 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 11 Jul 2006 09:53:44 +0000 (09:53 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4097 594d385d-05f5-0310-b6e9-bd551577e9d8

ihtml/themes/default/acl.tpl [new file with mode: 0644]
include/class_acl.inc [new file with mode: 0644]
include/class_tabs.inc
include/class_userinfo.inc
include/functions.inc
plugins/admin/acl/class_acl.inc [deleted file]
plugins/admin/acl/contents.tpl [deleted file]
plugins/admin/departments/class_departmentGeneric.inc

diff --git a/ihtml/themes/default/acl.tpl b/ihtml/themes/default/acl.tpl
new file mode 100644 (file)
index 0000000..84a108c
--- /dev/null
@@ -0,0 +1,87 @@
+{if $dialogState eq 'head'}
+<h1>{t}Assigned ACLs for current entry{/t}</h1>
+{$aclList}
+<input type="submit" name="new_acl" value="{t}New ACL{/t}">
+{/if}
+
+{if $dialogState eq 'create'}
+<h1>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">&nbsp;</option>{html_options options=$aclTypes selected=$aclType}<option disabled></select>&nbsp;{if $javascript eq 'false'}<input type="submit" value="{t}Apply{/t}" name="refresh">{/if}</h1>
+
+<p class="seperator">&nbsp;</p>
+
+<table style="width:100%">
+ <tr>
+  <td style="width:48%; vertical-align:top;">
+   {t}Use members from{/t}
+   <select name="target" onChange="document.mainform.submit()">
+        {html_options options=$targets selected=$target}
+        <option disabled>&nbsp;</option>
+   </select>
+   {if $javascript eq 'false'}<input type="submit" value="{t}Apply{/t}" name="refresh">{/if}<br><br>
+  </td>
+  <td>
+  </td>
+  <td>
+  </td>
+ </tr>
+ <tr>
+  <td style="width:48%">
+   {t}Available members{/t}<br>
+   <select style="width:100%;height:180px;" name="source[]" size="20" multiple title="{t}List message possible targets{/t}">
+            {html_options options=$sources}
+            <option disabled>&nbsp;</option>
+   </select>
+  </td>
+  <td style="vertical-align:center; text-align:center">
+   <input type="submit" value="&gt;" name="add">
+   <br><br>
+   <input type="submit" value="&lt;" name="del">
+  </td>
+  <td style="width:48%; vertical-align:top;">
+   {t}Members{/t}<br>
+   <select style="width:100%;height:180px;" name="recipient[]" size="20" multiple title="{t}List message recipients{/t}">
+            {html_options options=$recipients}
+            <option disabled>&nbsp;</option>
+   </select>
+  </td>
+ </tr>
+</table>
+
+{if $aclType ne 'reset'}
+{if $aclType ne 'role'}
+{if $aclType ne 'base'}
+<p class="seperator">&nbsp;</p>
+
+<h1>{t}List of available ACL categories{/t}</h1>
+{$aclList}
+{/if}
+{/if}
+{/if}
+
+{if $aclType eq 'base'}
+<p class="seperator">&nbsp;</p>
+<h1>{t}ACLs for this object{/t}</h1>
+{$aclSelector}
+{/if}
+
+<p class="seperator">&nbsp;</p>
+<div style='text-align:right;margin-top:5px'>
+       <input type="submit" name="submit_new_acl" value="{t}Apply{/t}">
+       &nbsp;
+       <input type="submit" name="cancel_new_acl" value="{t}Cancel{/t}">
+</div>
+{/if}
+
+{if $dialogState eq 'edit'}
+
+<h1>{$headline}</h1>
+
+{$aclSelector}
+
+<p class="seperator">&nbsp;</p>
+<div style='text-align:right;margin-top:5px'>
+       <input type="submit" name="submit_edit_acl" value="{t}Apply{/t}">
+       &nbsp;
+       <input type="submit" name="cancel_edit_acl" value="{t}Cancel{/t}">
+</div>
+{/if}
diff --git a/include/class_acl.inc b/include/class_acl.inc
new file mode 100644 (file)
index 0000000..63f5076
--- /dev/null
@@ -0,0 +1,785 @@
+<?php
+
+class acl extends plugin
+{
+  /* Definitions */
+  var $plHeadline= "Access control";
+  var $plDescription= "This does something";
+
+  /* attribute list for save action */
+  var $attributes= array('gosaAclEntry');
+  var $objectclasses= array('gosaAcl');
+
+  /* Helpers */
+  var $dialogState= "head";
+  var $gosaAclEntry= array();
+  var $aclType= "";
+  var $aclObject= "";
+  var $aclContents= array();
+  var $target= "group";
+  var $aclTypes= array();
+  var $aclObjects= array();
+  var $aclMyObjects= array();
+  var $users= array();
+  var $groups= array();
+  var $recipients= array();
+  var $isContainer= FALSE;
+  var $currentIndex= 0;
+  var $wasNewEntry= FALSE;
+  var $ocMapping= array();
+  var $savedAclContents= array();
+
+
+  function acl ($config, $parent, $dn= NULL)
+  {
+    /* Include config object */
+    plugin::plugin($config, $dn);
+
+    /* Load ACL's */
+    $this->gosaAclEntry= array();
+    if (isset($this->attrs['gosaAclEntry'])){
+      for ($i= 0; $i<$this->attrs['gosaAclEntry']['count']; $i++){
+        $acl= $this->attrs['gosaAclEntry'][$i];
+        $this->gosaAclEntry= array_merge($this->gosaAclEntry, $this->explodeACL($acl));
+      }
+    }
+    ksort($this->gosaAclEntry);
+
+    /* Save parent - we've to know more about it than other plugins... */
+    $this->parent= $parent;
+
+    /* Container? */
+    if (preg_match('/^(ou|c|l|dc)=/i', $dn)){
+      $this->isContainer= TRUE;
+    }
+
+    /* Users */
+    $ui= get_userinfo();
+    $tag= $ui->gosaUnitTag;
+    $ldap= $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    if ($tag == ""){
+      $ldap->search('(objectClass=gosaAccount)', array('uid', 'cn'));
+    } else {
+      $ldap->search('(&(objectClass=gosaAccount)(gosaUnitTag='.$tag.'))', array('uid', 'cn'));
+    }
+    while ($attrs= $ldap->fetch()){
+      $this->users['U:'.$attrs['dn']]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
+    }
+    ksort($this->users);
+
+    /* Groups */
+    $ldap->cd($config->current['BASE']);
+    if ($tag == ""){
+      $ldap->search('(objectClass=posixGroup)', array('cn', 'description'));
+    } else {
+      $ldap->search('(&(objectClass=posixGroup)(gosaUnitTag='.$tag.'))', array('cn', 'description'));
+    }
+    while ($attrs= $ldap->fetch()){
+      $dsc= "";
+      if (isset($attrs['description'][0])){
+        $dsc= $attrs['description'][0];
+      }
+      $this->groups['G:'.$attrs['dn']]= $attrs['cn'][0].' ['.$dsc.']';
+    }
+    ksort($this->groups);
+
+    /* Objects */
+    $tmp= get_global('plist');
+    $plist= $tmp->info;
+    if (isset($this->parent)){
+      $oc= array();
+      foreach ($this->parent->by_object as $key => $obj){
+        $oc= array_merge($oc, $obj->objectclasses);
+      }
+      if (in_array_ics('organizationalUnit', $oc)){
+        $this->isContainer= TRUE;
+      }
+    } else {
+      $oc=  $this->attrs['objectClass'];
+    }
+    foreach ($plist as $class => $acls){
+      if (isset($acls['plDescription'])){
+        /* Only feed categories */
+        if (isset($acls['plDepends']['description'])){
+          $this->aclObjects[$acls['plDepends']['objectClass']]= $acls['plDepends']['description'];
+        }
+
+        /* Additionally filter the classes we're interested in in "self edit" mode */
+        if (in_array_ics($acls['plDepends']['objectClass'], $oc)){
+          $this->myAclObjects[$class]= $acls['plDescription'];
+        }
+      }
+    }
+    asort($this->aclObjects);
+
+    /* Generate mapping object */
+    foreach ($plist as $oc => $pl){
+      if (isset($pl['plDepends']['objectClass'])){
+        $class= $pl['plDepends']['objectClass'];
+        if (!isset($this->ocMapping[$class])){
+          $this->ocMapping[$class]= array();
+        }
+        $this->ocMapping[$class][]= $oc;
+      }
+    }
+
+    /* Fill acl types */
+    if ($this->isContainer){
+      $this->aclTypes= array("reset" => _("Reset ACLs"),
+                             "one" => _("One level"),
+                             "base" => _("Current object"),
+                             "sub" => _("Complete subtree"),
+                             "psub" => _("Complete subtree (permanent)"),
+                             "role" => _("Use ACL defined in role"));
+    } else {
+      $this->aclTypes= array("base" => _("Current object"),
+          "role" => _("Use ACL defined in role"));
+    }
+    asort($this->aclTypes);
+    $this->targets= array("user" => _("Users"), "group" => _("Groups"));
+    asort($this->targets);
+
+    /* Finally - we want to get saved... */
+    $this->is_account= TRUE;
+  }
+
+
+  function execute()
+  {
+    /* Call parent execute */
+    plugin::execute();
+
+    $tmp= get_global('plist');
+    $plist= $tmp->info;
+
+    /* Handle posts */
+    if (isset($_POST['new_acl'])){
+      $this->dialogState= 'create';
+      $this->dialog= TRUE;
+      $this->currentIndex= count($this->gosaAclEntry);
+      $this->loadAclEntry(TRUE);
+    }
+
+    $new_acl= array();
+    $aclDialog= FALSE;
+    foreach($_POST as $name => $post){
+
+      /* Actions... */
+      if (preg_match('/^acl_edit_.*_x/', $name)){
+        $this->dialogState= 'create';
+        $this->dialog= TRUE;
+        $this->currentIndex= preg_replace('/^acl_edit_([0-9]+).*$/', '\1', $name);
+        $this->loadAclEntry();
+        continue;
+      }
+      if (preg_match('/^acl_del_.*_x/', $name)){
+        unset($this->gosaAclEntry[preg_replace('/^acl_del_([0-9]+).*$/', '\1', $name)]);
+        continue;
+      }
+
+      if (preg_match('/^cat_edit_.*_x/', $name)){
+        $this->aclObject= preg_replace('/^cat_edit_([^_]+)_.*$/', '\1', $name);
+        $this->dialogState= 'edit';
+        foreach ($this->ocMapping[$this->aclObject] as $oc){
+          if (isset($this->aclContents[$oc])){
+            $this->savedAclContents[$oc]= $this->aclContents[$oc];
+          }
+        }
+        continue;
+      }
+      if (preg_match('/^cat_del_.*_x/', $name)){
+        $idx= preg_replace('/^cat_del_([^_]+)_.*$/', '\1', $name);
+        foreach ($this->ocMapping[$idx] as $key){
+          unset($this->aclContents[$key]);
+        }
+        continue;
+      }
+
+      /* Sorting... */
+      if (preg_match('/^sortup_.*_x/', $name)){
+        $index= preg_replace('/^sortup_([0-9]+).*$/', '\1', $name);
+        if ($index > 0){
+          $tmp= $this->gosaAclEntry[$index];
+          $this->gosaAclEntry[$index]= $this->gosaAclEntry[$index-1];
+          $this->gosaAclEntry[$index-1]= $tmp;
+        }
+        continue;
+      }
+      if (preg_match('/^sortdown_.*_x/', $name)){
+        $index= preg_replace('/^sortdown_([0-9]+).*$/', '\1', $name);
+        if ($index < count($this->gosaAclEntry)-1){
+          $tmp= $this->gosaAclEntry[$index];
+          $this->gosaAclEntry[$index]= $this->gosaAclEntry[$index+1];
+          $this->gosaAclEntry[$index+1]= $tmp;
+        }
+        continue;
+      }
+
+      /* ACL saving... */
+      if (preg_match('/^acl_.*_[^xy]$/', $name)){
+        $aclDialog= TRUE;
+        list($dummy, $object, $attribute, $value)= split('_', $name);
+
+        /* Ordinary ACLs */
+        if (!isset($new_acl[$object])){
+          $new_acl[$object]= array();
+        }
+        if (isset($new_acl[$object][$attribute])){
+          $new_acl[$object][$attribute].= $value;
+        } else {
+          $new_acl[$object][$attribute]= $value;
+        }
+      }
+
+    }
+    
+    /* Only be interested in new acl's, if we're in the right _POST place */
+    if ($aclDialog && isset($this->ocMapping[$this->aclObject])){
+      foreach ($this->ocMapping[$this->aclObject] as $oc){
+        unset($this->aclContents[$oc]);
+        if (isset($new_acl[$oc])){
+          $this->aclContents[$oc]= $new_acl[$oc];
+        }
+      }
+    }
+
+    /* Cancel new acl? */
+    if (isset($_POST['cancel_new_acl'])){
+      $this->dialogState= 'head';
+      $this->dialog= FALSE;
+      if ($this->wasNewEntry){
+        unset ($this->gosaAclEntry[$this->currentIndex]);
+      }
+    }
+
+    /* Store ACL in mail object? */
+    if (isset($_POST['submit_new_acl'])){
+      $this->gosaAclEntry[$this->currentIndex]['type']= $this->aclType;
+      $this->gosaAclEntry[$this->currentIndex]['members']= $this->recipients;
+      $this->gosaAclEntry[$this->currentIndex]['acl']= $this->aclContents;
+      $this->dialogState= 'head';
+      $this->dialog= FALSE;
+    }
+
+    /* Cancel edit acl? */
+    if (isset($_POST['cancel_edit_acl'])){
+      $this->dialogState= 'create';
+      foreach ($this->ocMapping[$this->aclObject] as $oc){
+        if (isset($this->savedAclContents[$oc])){
+          $this->aclContents[$oc]= $this->savedAclContents[$oc];
+        }
+      }
+    }
+
+    /* Save edit acl? */
+    if (isset($_POST['submit_edit_acl'])){
+      $this->dialogState= 'create';
+    }
+
+    /* Add acl? */
+    if (isset($_POST['add_acl']) && $_POST['aclObject'] != ""){
+      $this->dialogState= 'edit';
+      $this->savedAclContents= array();
+      foreach ($this->ocMapping[$this->aclObject] as $oc){
+        if (isset($this->aclContents[$oc])){
+          $this->savedAclContents[$oc]= $this->aclContents[$oc];
+        }
+      }
+    }
+
+    /* Add to list? */
+    if (isset($_POST['add']) && isset($_POST['source'])){
+      foreach ($_POST['source'] as $key){
+        if ($this->target == 'user'){
+          $this->recipients[$key]= $this->users[$key];
+        }
+        if ($this->target == 'group'){
+          $this->recipients[$key]= $this->groups[$key];
+        }
+      }
+      ksort($this->recipients);
+    }
+
+    /* Remove from list? */
+    if (isset($_POST['del']) && isset($_POST['recipient'])){
+      foreach ($_POST['recipient'] as $key){
+          unset($this->recipients[$key]);
+      }
+    }
+
+    /* Save common values */
+    foreach (array("aclType", "aclObject", "target") as $key){
+      if (isset($_POST[$key])){
+        $this->$key= validate($_POST[$key]);
+      }
+    }
+
+    /* Create templating instance */
+    $smarty= get_smarty();
+
+    if ($this->dialogState == 'head'){
+      /* Draw list */
+      $aclList= new DivSelectBox("aclList");
+      $aclList->SetHeight(450);
+      
+      /* Fill in entries */
+      foreach ($this->gosaAclEntry as $key => $entry){
+        $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:100px'");
+        $field2= array("string" => $this->assembleAclSummary($entry));
+        $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
+        $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
+        $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='acl_edit_$key' title='"._("Edit ACL")."'>";
+        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='acl_del_$key' title='"._("Delete ACL")."'>";
+
+        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px';text-align:right");
+        $aclList->AddEntry(array($field1, $field2, $field3));
+      }
+
+      $smarty->assign("aclList", $aclList->DrawList());
+    }
+
+    if ($this->dialogState == 'create'){
+      /* Draw list */
+      $aclList= new DivSelectBox("aclList");
+      $aclList->SetHeight(150);
+
+      /* Add settings for all categories to the (permanent) list */
+      foreach ($this->aclObjects as $oc => $dsc){
+        $summary= "";
+        foreach ($plist as $key => $plugin){
+          if (isset($plugin['plDepends']['objectClass']) && $plugin['plDepends']['objectClass'] == $oc &&
+              isset($this->aclContents[$key])){
+            if (count($this->aclContents[$key]) && isset($this->aclContents[$key][0]) &&
+                $this->aclContents[$key][0] != ""){
+              $summary.= "$key, ";
+            }
+          }
+        }
+
+        /* Set summary... */
+        if ($summary == ""){
+          $summary= _("No ACL settings for this category");
+        } else {
+          $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary));
+        }
+
+        $field1= array("string" => $dsc, "attach" => "style='width:100px'");
+        $field2= array("string" => $summary);
+        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='cat_edit_$oc' title='"._("Edit categories ACLs")."'>";
+        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='cat_del_$oc' title='"._("Clear categories ACLs")."'>";
+        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
+        $aclList->AddEntry(array($field1, $field2, $field3));
+      }
+
+      $smarty->assign("aclList", $aclList->DrawList());
+      $smarty->assign("aclType", $this->aclType);
+      $smarty->assign("aclTypes", $this->aclTypes);
+      $smarty->assign("target", $this->target);
+      $smarty->assign("targets", $this->targets);
+
+      /* Assign possible target types */
+      $smarty->assign("targets", $this->targets);
+      foreach ($this->attributes as $attr){
+        $smarty->assign($attr, $this->$attr);
+      }
+
+
+      /* Generate list */
+      $tmp= array();
+      foreach (array("user" => "users", "group" => "groups") as $field => $arr){
+        if ($this->target == $field){
+          foreach ($this->$arr as $key => $value){
+            if (!isset($this->recipients[$key])){
+              $tmp[$key]= $value;
+            }
+          }
+        }
+      }
+      $smarty->assign('sources', $tmp);
+      $smarty->assign('recipients', $this->recipients);
+
+      /* Acl selector if scope is base */
+      if ($this->aclType == 'base'){
+        $smarty->assign('aclSelector', $this->buildAclSelector($this->myAclObjects));
+      }
+    }
+
+    if ($this->dialogState == 'edit'){
+      $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 ($plist as $class => $acls){
+        if (isset($acls['plDepends']['objectClass']) && $acls['plDepends']['objectClass'] == $this->aclObject){
+          $aclObjects[$class]= $acls['plDescription'];
+        }
+      }
+
+      $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects));
+    }
+
+    /* Show main page */
+    $smarty->assign("dialogState", $this->dialogState);
+    return ($smarty->fetch (get_template_path('acl.tpl')));
+  }
+
+  
+  function buildAclSelector($list)
+  {
+    $display= "";
+    $cols= 4;
+    $tmp= get_global('plist');
+    $plist= $tmp->info;
+    asort($plist);
+
+    foreach ($list as $key => $name){
+
+      /* Create sub acl if it does not exist */
+      if (!isset($this->aclContents[$key])){
+        $this->aclContents[$key]= array();
+      }
+      if (!isset($this->aclContents[$key][0])){
+        $this->aclContents[$key][0]= '';
+      }
+      $currentAcl= $this->aclContents[$key];
+
+      /* Object header */
+      $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em' colspan=$cols><b>"._("Object").":</b> $name</td></tr>";
+
+      /* Generate options */
+      $spc= "&nbsp;&nbsp;";
+      if ($this->isContainer && $this->aclType != 'base'){
+        $options= $this->mkchkbx($key."_0_c",  _("Create objects"), preg_match('/c/', $currentAcl[0])).$spc;
+        $options.= $this->mkchkbx($key."_0_m", _("Move objects"), preg_match('/m/', $currentAcl[0])).$spc;
+        $options.= $this->mkchkbx($key."_0_d", _("Remove objects"), preg_match('/d/', $currentAcl[0])).$spc;
+        if ($plist[$key]['plSelfModify']){
+          $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
+        }
+      } else {
+        $options= $this->mkchkbx($key."_0_m", _("Move object"), preg_match('/m/', $currentAcl[0])).$spc;
+        $options.= $this->mkchkbx($key."_0_d", _("Remove object"), preg_match('/d/', $currentAcl[0])).$spc;
+        if ($plist[$key]['plSelfModify']){
+          $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
+        }
+      }
+
+      $display.= "<tr><td style='background-color:#E0E0E0' colspan=$cols>$options</td></tr>";
+
+      /* Walk through the list of attributes */
+      $cnt= 1;
+      $splist= $plist[$key];
+      asort($splist);
+      foreach($splist as $attr => $dsc){
+
+        /* Skip pl* attributes, they are internal... */
+        if (preg_match('/^pl[A-Z]+.*$/', $attr)){
+          continue;
+        }
+
+        /* Open table row */
+        if ($cnt == 1){
+          $display.= "<tr>";
+        }
+
+        /* Close table row */
+        if ($cnt == $cols){
+          $cnt= 1;
+          $rb= "";
+          $end= "</tr>";
+        } else {
+          $cnt++;
+          $rb= "border-right:1px solid #A0A0A0;";
+          $end= "";
+        }
+
+        /* Collect list of attributes */
+        $state= "";
+        if (isset($currentAcl[$attr])){
+          $state= $currentAcl[$attr];
+        }
+        $display.= "<td style='border-top:1px solid #A0A0A0;${rb}width:".(int)(100/$cols)."%'><b>$dsc</b> ($attr)<br>".$this->mkrwbx($key."_".$attr, $state)."</td>$end";
+      }
+      
+      /* Fill missing td's if needed */
+      if (--$cnt != $cols){
+       $display.= str_repeat("<td style='border-top:1px solid #A0A0A0'>&nbsp;</td>", $cols-$cnt); 
+      }
+
+      $display.= "</table><br>";
+    }
+
+    return ($display);
+  }
+
+
+  function mkchkbx($name, $text, $state= FALSE)
+  {
+    $state= $state?"checked":"";
+    return "<input id='acl_$name' type=checkbox name='acl_$name' $state><label for='acl_$name'>$text</label>";
+  }
+
+
+  function mkrwbx($name, $state= "")
+  {
+    $rstate= preg_match('/r/', $state)?'checked':'';
+    $wstate= preg_match('/w/', $state)?'checked':'';
+    return ("<input id='acl_${name}_r' type=checkbox name='acl_${name}_r' $rstate><label for='acl_${name}_r'>"._("read")."</label>".
+            "<input id='acl_${name}_w' type=checkbox name='acl_${name}_w' $wstate><label for='acl_${name}_w'>"._("write")."</label>");
+  }
+
+
+  function explodeACL($acl)
+  {
+    list($index, $type)= split(':', $acl);
+    $a= array( $index => array("type" => $type,
+                               "members" => acl::extractMembers($acl)));
+    
+    /* Handle different types */
+    switch ($type){
+
+      case 'psub':
+      case 'sub':
+      case 'one':
+      case 'base':
+        $a[$index]['acl']= acl::extractACL($acl);
+        break;
+      
+      case 'role':
+        echo "Role";
+        break;
+
+      case 'reset':
+        break;
+      
+      default:
+        print_red(sprintf(_("Unkown ACL type '%s'. Don't know how to handle it."), $type));
+        $a= array();
+    }
+    
+    return ($a);
+  }
+
+
+  function extractMembers($acl)
+  {
+    global $config;
+    $a= array();
+
+    /* Rip acl off the string, seperate by ',' and place it in an array */
+    $ms= preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl);
+    if ($ms == $acl){
+      return $a;
+    }
+    $ma= split(',', $ms);
+
+    /* Decode dn's, fill with informations from LDAP */
+    $ldap= $config->get_ldap_link();
+    foreach ($ma as $memberdn){
+      $dn= base64_decode($memberdn);
+      $ldap->cat($dn, array('cn', 'objectClass', 'description', 'uid'));
+
+      /* Found entry... */
+      if ($ldap->count()){
+        $attrs= $ldap->fetch();
+        if (in_array_ics('gosaAccount', $attrs['objectClass'])){
+          $a['U:'.$dn]= $attrs['cn'][0]." [".$attrs['uid'][0]."]";
+        } else {
+          $a['G:'.$dn]= $attrs['cn'][0];
+          if (isset($attrs['description'][0])){
+            $a['G:'.$dn].= " [".$attrs['description'][0]."]";
+          }
+        }
+
+      /* ... or not */
+      } else {
+        $a['U:'.$dn]= sprintf(_("Unknown entry '%s'!"), $dn);
+      }
+    }
+
+    return ($a);
+  }
+
+
+  function extractACL($acl)
+  {
+    /* Rip acl off the string, seperate by ',' and place it in an array */
+    $as= preg_replace('/^[^:]+:[^:]+:[^:]+:(.*)$/', '\1', $acl);
+    $aa= split(',', $as);
+    $a= array();
+
+    /* Dis-assemble single ACLs */
+    foreach($aa as $sacl){
+      
+      /* Dis-assemble field ACLs */
+      $ao= split('#', $sacl);
+      $gobject= "";
+      foreach($ao as $idx => $ssacl){
+
+        /* First is department with global acl */
+        $object= preg_replace('/^([^;]+);.*$/', '\1', $ssacl);
+        $gacl=   preg_replace('/^[^;]+;(.*)$/', '\1', $ssacl);
+        if ($idx == 0){
+          /* Create hash for this object */
+          $gobject= $object;
+          $a[$gobject]= array();
+
+          /* Append ACL if set */
+          if ($gacl != ""){
+            $a[$gobject]= array($gacl);
+          }
+        } else {
+
+          /* All other entries get appended... */
+          list($field, $facl)= split(';', $ssacl);
+          $a[$gobject][$field]= $facl;
+        }
+
+      }
+    }
+
+    return ($a);
+  }
+
+  
+  function assembleAclSummary($entry)
+  {
+    $summary= "";
+
+    /* Summarize ACL */
+    if (isset($entry['acl'])){
+      $acl= "";
+      foreach ($entry['acl'] as $name => $object){
+        $acl.= "$name, ";
+      }
+      $summary.= sprintf(_("Contains settings for these objects: %s"), preg_replace('/, $/', '', $acl));
+    }
+
+    /* Summarize members */
+    if ($summary != ""){
+      $summary.= ", ";
+    }
+    if (count($entry['members'])){
+      $summary.= _("Members:")." ";
+      foreach ($entry['members'] as $cn){
+        $cn= preg_replace('/ \[.*$/', '', $cn);
+        $summary.= $cn.", ";
+      }
+    } else {
+      $summary.= _("ACLs is valid for all users");
+    }
+
+    return (preg_replace('/, $/', '', $summary));
+  }
+
+
+  function loadAclEntry($new= FALSE)
+  {
+    /* New entry gets presets... */
+    if ($new){
+      $this->aclType= 'base';
+      $this->recipients= array();
+      $this->aclContents= array();
+    } else {
+      $acl= $this->gosaAclEntry[$this->currentIndex];
+      $this->aclType= $acl['type'];
+      $this->recipients= $acl['members'];
+      $this->aclContents= $acl['acl'];
+    }
+
+    $this->wasNewEntry= $new;
+  }
+
+
+  function aclPostHandler()
+  {
+    if (isset($_POST['save_acl'])){
+      $this->save();
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
+
+  function save()
+  {
+    /* Assemble ACL's */
+    $tmp_acl= array();
+    foreach ($this->gosaAclEntry as $prio => $entry){
+      $final= "";
+      $members= "";
+      if (isset($entry['members'])){
+        foreach ($entry['members'] as $key => $dummy){
+          $members.= base64_encode(preg_replace('/^.:/', '', $key)).',';
+        }
+      }
+      $final= $prio.":".$entry['type'].":".preg_replace('/,$/', '', $members);
+
+      /* ACL's if needed */
+      if ($entry['type'] != "reset" && $entry['type'] != "role"){
+        $acl= ":";
+        if (isset($entry['acl'])){
+          foreach ($entry['acl'] as $object => $contents){
+            $acl.= $object.";";
+            
+            foreach($contents as $attr => $permission){
+
+              /* First entry? Its the one for global settings... */
+              if ($attr == '0'){
+                $acl.= $permission;
+              } else {
+                $acl.= '#'.$attr.';'.$permission;
+              }
+
+            }
+            $acl.= ',';
+            
+          }
+        }
+        $final.= preg_replace('/,$/', '', $acl);
+      }
+
+      $tmp_acl[]= $final;
+    } 
+
+    /* Call main method */
+    plugin::save();
+
+    /* Finally (re-)assign it... */
+    $this->attrs['gosaAclEntry']= $tmp_acl;
+
+    /* Remove acl from this entry if it is empty... */
+    if (!count($tmp_acl)){
+      /* Remove attribute */
+      if ($this->initially_was_account){
+        $this->attrs['gosaAclEntry']= array();
+      } else {
+        if (isset($this->attrs['gosaAclEntry'])){
+          unset($this->attrs['gosaAclEntry']);
+        }
+      }
+
+      /* Remove object class */
+      $this->attrs['objectClass']= array_remove_entries(array('gosaAcl'), $this->attrs['objectClass']);
+    }    
+
+    /* Do LDAP modifications */
+    $ldap= $config->get_ldap_link();
+    $ldap->cd($this->dn);
+    $this->cleanup();
+    $ldap->modify ($this->attrs);
+
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving ACLs with dn '%s' failed."),$this->dn));
+  }
+
+
+  function remove_from_parent()
+  {
+    echo "remove_from_parent() called";
+  }
+
+}
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>
index a4ef265c766d48a5cd5d84e21629de45a7f06c15..fc1af5227fff3637bc355cc45634c6d7ab86c5bd 100644 (file)
@@ -140,9 +140,9 @@ class tabs
                $display.= "<td style=\"vertical-align:bottom;width:1px;\">";
 
                /* Shorten string if its too long for the tab headers*/
-               $title= _($name);
-               if (mb_strlen($title, 'UTF-8') > 14){
-                       $title= mb_substr($title,0, 12, 'UTF-8')."...";
+               $title= '<nobr>'._($name).'</nobr>';
+               if (mb_strlen($title, 'UTF-8') > 28){
+                       $title= mb_substr($title,0, 25, 'UTF-8')."...";
                }
                
                if ($_SESSION['js']==FALSE){    
@@ -292,7 +292,7 @@ class tabs
   function addSpecialTabs()
   {
        $this->by_name['acl']= _("ACL");
-       $this->by_object['acl']= new acl($this->config, $this->dn);
+       $this->by_object['acl']= new acl($this->config, $this, $this->dn);
        $this->by_object['acl']->parent= &$this;
        $this->by_name['reference']= _("References");
        $this->by_object['reference']= new reference($this->config, $this->dn);
index 77003f9e706d8bfeb1571e87f51aba54d3808492..af3103c0c4e2984f2d30f45ac70382c9dca65301 100644 (file)
@@ -24,11 +24,14 @@ class userinfo
   var $ip;
   var $username;
   var $cn;
+  var $uid;
   var $gidNumber= -1;
   var $language= "";
   var $config;
   var $gosaUnitTag= "";
   var $subtreeACL= array();
+  var $ACL= array();
+  var $groups= array();
 
   /* get acl's an put them into the userinfo object
      attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
@@ -57,6 +60,7 @@ class userinfo
     }
 
     $this->dn= $userdn;
+    $this->uid= $attrs['uid'][0];
     $this->ip= $_SERVER['REMOTE_ADDR'];
   }
 
@@ -84,6 +88,49 @@ class userinfo
         $this->subtreeACL[$base][]= $attrs["gosaSubtreeACL"][$i];
       }
     }
+
+#    echo "NEW ACL LOADING --------------------------------------------------------------------------------------------<br>";
+    $this->ACL= array();    
+    $this->groups= array();    
+    $ldap= $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+
+    /* Get member groups... */
+    $ldap->search("(&(objectClass=posixGroup)(memberUid=".$this->uid."))", array('dn'));
+    while ($attrs= $ldap->fetch()){
+      $this->groups[$attrs['dn']]= $attrs['dn'];
+    }
+
+    /* Crawl through ACLs and move relevant to the tree */
+    $ldap->search("(objectClass=gosaACL)", array('dn', 'gosaAclEntry'));
+    $aclp= array();
+    $aclc= array();
+    while ($attrs= $ldap->fetch()){
+
+      /* Insert links in ACL array */
+      $tree= split(',', $attrs['dn']);
+      $tree= array_reverse($tree);
+
+      $interresting= FALSE;
+      $t= acl::explodeAcl($attrs['gosaAclEntry'][0]);
+#      print_a($t);
+
+      /* We're interested in ACLs apply for *all* users... */
+
+      /* ... for groups we're member in... */
+
+      /* and for our DN as member. */
+
+
+      $aclp[$attrs['dn']]= substr_count($attrs['dn'], ',');
+      $aclc[$attrs['dn']]= $attrs['gosaAclEntry'];
+
+    }
+
+    /* ACL's read, sort for tree depth */
+    asort($aclp);
+
+#print_a($aclp);
   }
 
 }
index 2ac55c8a466e31a0a311bedbbc8d8ab37afea035..a4e7b952b0236107faaf1b1f6dd187285e0eefa5 100644 (file)
@@ -36,12 +36,13 @@ $svn_revision = '$Revision$';
 /* Include required files */
 require_once ("class_ldap.inc");
 require_once ("class_config.inc");
-require_once ("class_userinfo.inc");
 require_once ("class_plugin.inc");
+require_once ("class_acl.inc");
+require_once ("class_userinfo.inc");
 require_once ("class_pluglist.inc");
 require_once ("class_tabs.inc");
 require_once ("class_mail-methods.inc");
-require_once("class_password-methods.inc");
+require_once ("class_password-methods.inc");
 require_once ("functions_debug.inc");
 require_once ("functions_dns.inc");
 require_once ("class_MultiSelectWindow.inc");
@@ -367,7 +368,6 @@ function ldap_login_user ($username, $password)
 
 function ldap_expired_account($config, $userdn, $username)
 {
-    //$this->config= $config; 
     $ldap= $config->get_ldap_link();
     $ldap->cat($userdn);
     $attrs= $ldap->fetch();
@@ -727,9 +727,11 @@ function getMenuCache()
   }
 }
 
+
 function get_permissions ($dn, $subtreeACL)
 {
   global $config;
+echo "get_permissions() - to be removed<br>";
 
   $base= $config->current['BASE'];
   $tmp= "d,".$dn;
@@ -765,6 +767,7 @@ function get_permissions ($dn, $subtreeACL)
 function get_module_permission($acl_array, $module, $dn)
 {
   global $ui;
+echo "get_module_permissions() - to be removed<br>";
 
   $final= "";
   foreach($acl_array as $acl){
@@ -923,6 +926,7 @@ function get_base_from_people($dn)
 
 function chkacl($acl, $name)
 {
+  echo "chkacl - to be removed<br>";
   /* Look for attribute in ACL */
   if (preg_match("/#$name#/", $acl) || $acl == "#all#"){
     return ("");
diff --git a/plugins/admin/acl/class_acl.inc b/plugins/admin/acl/class_acl.inc
deleted file mode 100644 (file)
index 1a1539e..0000000
+++ /dev/null
@@ -1,768 +0,0 @@
-<?php
-
-class acl extends plugin
-{
-  /* Definitions */
-  var $plHeadline= "Access control";
-  var $plDescription= "This does something";
-
-  /* attribute list for save action */
-  var $attributes= array('gosaAclEntry');
-  var $objectclasses= array('gosaAcl');
-
-  /* Helpers */
-  var $dialogState= "head";
-  var $gosaAclEntry= array();
-  var $aclType= "";
-  var $aclObject= "";
-  var $aclContents= array();
-  var $target= "group";
-  var $aclTypes= array();
-  var $aclObjects= array();
-  var $aclMyObjects= array();
-  var $users= array();
-  var $groups= array();
-  var $recipients= array();
-  var $isContainer= FALSE;
-  var $currentIndex= 0;
-  var $wasNewEntry= FALSE;
-  var $ocMapping= array();
-  var $savedAclContents= array();
-
-
-  function acl ($config, $dn= NULL)
-  {
-    /* Include config object */
-    plugin::plugin($config, $dn);
-
-    /* Load ACL's */
-    $this->gosaAclEntry= array();
-    if (isset($this->attrs['gosaAclEntry'])){
-      for ($i= 0; $i<$this->attrs['gosaAclEntry']['count']; $i++){
-        $acl= $this->attrs['gosaAclEntry'][$i];
-        $this->gosaAclEntry= array_merge($this->gosaAclEntry, $this->explodeACL($acl));
-      }
-    }
-    ksort($this->gosaAclEntry);
-
-    /* Container? */
-    if (preg_match('/^(ou|c|l|dc)=/i', $dn)){
-      $this->isContainer= TRUE;
-    }
-
-    /* Fill acl types */
-    if ($this->isContainer){
-      $this->aclTypes= array("reset" => _("Reset ACLs"),
-                             "one" => _("One level"),
-                             "base" => _("Current object"),
-                             "sub" => _("Complete subtree"),
-                             "psub" => _("Complete subtree (permanent)"),
-                             "role" => _("Use ACL defined in role"));
-    } else {
-      $this->aclTypes= array("base" => _("Current object"),
-          "role" => _("Use ACL defined in role"));
-    }
-    asort($this->aclTypes);
-    $this->targets= array("user" => _("Users"), "group" => _("Groups"));
-    asort($this->targets);
-
-    /* Users */
-    $ui= get_userinfo();
-    $tag= $ui->gosaUnitTag;
-    $ldap= $config->get_ldap_link();
-    $ldap->cd($config->current['BASE']);
-    if ($tag == ""){
-      $ldap->search('(objectClass=gosaAccount)', array('uid', 'cn'));
-    } else {
-      $ldap->search('(&(objectClass=gosaAccount)(gosaUnitTag='.$tag.'))', array('uid', 'cn'));
-    }
-    while ($attrs= $ldap->fetch()){
-      $this->users['U:'.$attrs['dn']]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
-    }
-    ksort($this->users);
-
-    /* Groups */
-    $ldap->cd($config->current['BASE']);
-    if ($tag == ""){
-      $ldap->search('(objectClass=posixGroup)', array('cn', 'description'));
-    } else {
-      $ldap->search('(&(objectClass=posixGroup)(gosaUnitTag='.$tag.'))', array('cn', 'description'));
-    }
-    while ($attrs= $ldap->fetch()){
-      $dsc= "";
-      if (isset($attrs['description'][0])){
-        $dsc= $attrs['description'][0];
-      }
-      $this->groups['G:'.$attrs['dn']]= $attrs['cn'][0].' ['.$dsc.']';
-    }
-    ksort($this->groups);
-
-    /* Objects */
-    $tmp= get_global('plist');
-    $plist= $tmp->info;
-    foreach ($plist as $class => $acls){
-      if (isset($acls['plDescription'])){
-        /* Only feed categories */
-        if (isset($acls['plDepends']['description'])){
-          $this->aclObjects[$acls['plDepends']['objectClass']]= $acls['plDepends']['description'];
-        }
-
-        /* Additionally filter the classes we're interested in in "self edit" mode */
-        if (in_array_ics($acls['plDepends']['objectClass'], $this->attrs['objectClass'])){
-          $this->myAclObjects[$class]= $acls['plDescription'];
-        }
-      }
-    }
-    asort($this->aclObjects);
-
-    /* Generate mapping object */
-    foreach ($plist as $oc => $pl){
-      if (isset($pl['plDepends']['objectClass'])){
-        $class= $pl['plDepends']['objectClass'];
-        if (!isset($this->ocMapping[$class])){
-          $this->ocMapping[$class]= array();
-        }
-        $this->ocMapping[$class][]= $oc;
-      }
-    }
-    $this->is_account= TRUE;
-  }
-
-
-  function execute()
-  {
-    /* Call parent execute */
-    plugin::execute();
-
-    $tmp= get_global('plist');
-    $plist= $tmp->info;
-
-    /* Handle posts */
-    if (isset($_POST['new_acl'])){
-      $this->dialogState= 'create';
-      $this->dialog= TRUE;
-      $this->currentIndex= count($this->gosaAclEntry);
-      $this->loadAclEntry(TRUE);
-    }
-
-    $new_acl= array();
-    $aclDialog= FALSE;
-    foreach($_POST as $name => $post){
-
-      /* Actions... */
-      if (preg_match('/^acl_edit_.*_x/', $name)){
-        $this->dialogState= 'create';
-        $this->dialog= TRUE;
-        $this->currentIndex= preg_replace('/^acl_edit_([0-9]+).*$/', '\1', $name);
-        $this->loadAclEntry();
-        continue;
-      }
-      if (preg_match('/^acl_del_.*_x/', $name)){
-        unset($this->gosaAclEntry[preg_replace('/^acl_del_([0-9]+).*$/', '\1', $name)]);
-        continue;
-      }
-
-      if (preg_match('/^cat_edit_.*_x/', $name)){
-        $this->aclObject= preg_replace('/^cat_edit_([^_]+)_.*$/', '\1', $name);
-        $this->dialogState= 'edit';
-        foreach ($this->ocMapping[$this->aclObject] as $oc){
-          if (isset($this->aclContents[$oc])){
-            $this->savedAclContents[$oc]= $this->aclContents[$oc];
-          }
-        }
-        continue;
-      }
-      if (preg_match('/^cat_del_.*_x/', $name)){
-        $idx= preg_replace('/^cat_del_([^_]+)_.*$/', '\1', $name);
-        foreach ($this->ocMapping[$idx] as $key){
-          unset($this->aclContents[$key]);
-        }
-        continue;
-      }
-
-      /* Sorting... */
-      if (preg_match('/^sortup_.*_x/', $name)){
-        $index= preg_replace('/^sortup_([0-9]+).*$/', '\1', $name);
-        if ($index > 0){
-          $tmp= $this->gosaAclEntry[$index];
-          $this->gosaAclEntry[$index]= $this->gosaAclEntry[$index-1];
-          $this->gosaAclEntry[$index-1]= $tmp;
-        }
-        continue;
-      }
-      if (preg_match('/^sortdown_.*_x/', $name)){
-        $index= preg_replace('/^sortdown_([0-9]+).*$/', '\1', $name);
-        if ($index < count($this->gosaAclEntry)-1){
-          $tmp= $this->gosaAclEntry[$index];
-          $this->gosaAclEntry[$index]= $this->gosaAclEntry[$index+1];
-          $this->gosaAclEntry[$index+1]= $tmp;
-        }
-        continue;
-      }
-
-      /* ACL saving... */
-      if (preg_match('/^acl_.*_[^xy]$/', $name)){
-        $aclDialog= TRUE;
-        list($dummy, $object, $attribute, $value)= split('_', $name);
-
-        /* Ordinary ACLs */
-        if (!isset($new_acl[$object])){
-          $new_acl[$object]= array();
-        }
-        if (isset($new_acl[$object][$attribute])){
-          $new_acl[$object][$attribute].= $value;
-        } else {
-          $new_acl[$object][$attribute]= $value;
-        }
-      }
-
-    }
-    
-    /* Only be interested in new acl's, if we're in the right _POST place */
-    if ($aclDialog && isset($this->ocMapping[$this->aclObject])){
-      foreach ($this->ocMapping[$this->aclObject] as $oc){
-        unset($this->aclContents[$oc]);
-        if (isset($new_acl[$oc])){
-          $this->aclContents[$oc]= $new_acl[$oc];
-        }
-      }
-    }
-
-    /* Cancel new acl? */
-    if (isset($_POST['cancel_new_acl'])){
-      $this->dialogState= 'head';
-      $this->dialog= FALSE;
-      if ($this->wasNewEntry){
-        unset ($this->gosaAclEntry[$this->currentIndex]);
-      }
-    }
-
-    /* Store ACL in mail object? */
-    if (isset($_POST['submit_new_acl'])){
-      $this->gosaAclEntry[$this->currentIndex]['type']= $this->aclType;
-      $this->gosaAclEntry[$this->currentIndex]['members']= $this->recipients;
-      $this->gosaAclEntry[$this->currentIndex]['acl']= $this->aclContents;
-      $this->dialogState= 'head';
-      $this->dialog= FALSE;
-    }
-
-    /* Cancel edit acl? */
-    if (isset($_POST['cancel_edit_acl'])){
-      $this->dialogState= 'create';
-      foreach ($this->ocMapping[$this->aclObject] as $oc){
-        if (isset($this->savedAclContents[$oc])){
-          $this->aclContents[$oc]= $this->savedAclContents[$oc];
-        }
-      }
-    }
-
-    /* Save edit acl? */
-    if (isset($_POST['submit_edit_acl'])){
-      $this->dialogState= 'create';
-    }
-
-    /* Add acl? */
-    if (isset($_POST['add_acl']) && $_POST['aclObject'] != ""){
-      $this->dialogState= 'edit';
-      $this->savedAclContents= array();
-      foreach ($this->ocMapping[$this->aclObject] as $oc){
-        if (isset($this->aclContents[$oc])){
-          $this->savedAclContents[$oc]= $this->aclContents[$oc];
-        }
-      }
-    }
-
-    /* Add to list? */
-    if (isset($_POST['add']) && isset($_POST['source'])){
-      foreach ($_POST['source'] as $key){
-        if ($this->target == 'user'){
-          $this->recipients[$key]= $this->users[$key];
-        }
-        if ($this->target == 'group'){
-          $this->recipients[$key]= $this->groups[$key];
-        }
-      }
-      ksort($this->recipients);
-    }
-
-    /* Remove from list? */
-    if (isset($_POST['del']) && isset($_POST['recipient'])){
-      foreach ($_POST['recipient'] as $key){
-          unset($this->recipients[$key]);
-      }
-    }
-
-    /* Save common values */
-    foreach (array("aclType", "aclObject", "target") as $key){
-      if (isset($_POST[$key])){
-        $this->$key= validate($_POST[$key]);
-      }
-    }
-
-    /* Create templating instance */
-    $smarty= get_smarty();
-
-    if ($this->dialogState == 'head'){
-      /* Draw list */
-      $aclList= new DivSelectBox("aclList");
-      $aclList->SetHeight(450);
-      
-      /* Fill in entries */
-      foreach ($this->gosaAclEntry as $key => $entry){
-        $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:100px'");
-        $field2= array("string" => $this->assembleAclSummary($entry));
-        $action= "<input type='image' name='sortup_$key' alt='up' title='"._("Up")."' src='images/sort_up.png' align='top'>";
-        $action.= "<input type='image' name='sortdown_$key' alt='down' title='"._("Down")."' src='images/sort_down.png'>";
-        $action.= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='acl_edit_$key' title='"._("Edit ACL")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='acl_del_$key' title='"._("Delete ACL")."'>";
-
-        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px';text-align:right");
-        $aclList->AddEntry(array($field1, $field2, $field3));
-      }
-
-      $smarty->assign("aclList", $aclList->DrawList());
-    }
-
-    if ($this->dialogState == 'create'){
-      /* Draw list */
-      $aclList= new DivSelectBox("aclList");
-      $aclList->SetHeight(150);
-
-      /* Add settings for all categories to the (permanent) list */
-      foreach ($this->aclObjects as $oc => $dsc){
-        $summary= "";
-        foreach ($plist as $key => $plugin){
-          if (isset($plugin['plDepends']['objectClass']) && $plugin['plDepends']['objectClass'] == $oc &&
-              isset($this->aclContents[$key])){
-            if (count($this->aclContents[$key]) && isset($this->aclContents[$key][0]) &&
-                $this->aclContents[$key][0] != ""){
-              $summary.= "$key, ";
-            }
-          }
-        }
-
-        /* Set summary... */
-        if ($summary == ""){
-          $summary= _("No ACL settings for this category");
-        } else {
-          $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary));
-        }
-
-        $field1= array("string" => $dsc, "attach" => "style='width:100px'");
-        $field2= array("string" => $summary);
-        $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."' name='cat_edit_$oc' title='"._("Edit categories ACLs")."'>";
-        $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."' name='cat_del_$oc' title='"._("Clear categories ACLs")."'>";
-        $field3= array("string" => $action, "attach" => "style='border-right:0px;width:50px'");
-        $aclList->AddEntry(array($field1, $field2, $field3));
-      }
-
-      $smarty->assign("aclList", $aclList->DrawList());
-      $smarty->assign("aclType", $this->aclType);
-      $smarty->assign("aclTypes", $this->aclTypes);
-      $smarty->assign("target", $this->target);
-      $smarty->assign("targets", $this->targets);
-
-      /* Assign possible target types */
-      $smarty->assign("targets", $this->targets);
-      foreach ($this->attributes as $attr){
-        $smarty->assign($attr, $this->$attr);
-      }
-
-
-      /* Generate list */
-      $tmp= array();
-      foreach (array("user" => "users", "group" => "groups") as $field => $arr){
-        if ($this->target == $field){
-          foreach ($this->$arr as $key => $value){
-            if (!isset($this->recipients[$key])){
-              $tmp[$key]= $value;
-            }
-          }
-        }
-      }
-      $smarty->assign('sources', $tmp);
-      $smarty->assign('recipients', $this->recipients);
-
-      /* Acl selector if scope is base */
-      if ($this->aclType == 'base'){
-        $smarty->assign('aclSelector', $this->buildAclSelector($this->myAclObjects));
-      }
-    }
-
-    if ($this->dialogState == 'edit'){
-      $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 ($plist as $class => $acls){
-        if (isset($acls['plDepends']['objectClass']) && $acls['plDepends']['objectClass'] == $this->aclObject){
-          $aclObjects[$class]= $acls['plDescription'];
-        }
-      }
-
-      $smarty->assign('aclSelector', $this->buildAclSelector($aclObjects));
-    }
-
-    /* Show main page */
-    $smarty->assign("dialogState", $this->dialogState);
-    return ($smarty->fetch (get_template_path('contents.tpl', TRUE, get_base_dir().'/plugins/admin/acl')));
-  }
-
-  
-  function buildAclSelector($list)
-  {
-    $display= "";
-    $cols= 4;
-    $tmp= get_global('plist');
-    $plist= $tmp->info;
-    asort($plist);
-
-    foreach ($list as $key => $name){
-
-      /* Create sub acl if it does not exist */
-      if (!isset($this->aclContents[$key])){
-        $this->aclContents[$key]= array();
-      }
-      if (!isset($this->aclContents[$key][0])){
-        $this->aclContents[$key][0]= '';
-      }
-      $currentAcl= $this->aclContents[$key];
-
-      /* Object header */
-      $display.= "<table style='width:100%;border:1px solid #A0A0A0' cellspacing=0 cellpadding=2><tr><td style='background-color:#C8C8C8;height:1.8em' colspan=$cols><b>"._("Object").":</b> $name</td></tr>";
-
-      /* Generate options */
-      $spc= "&nbsp;&nbsp;";
-      if ($this->isContainer && $this->aclType != 'base'){
-        $options= $this->mkchkbx($key."_0_c",  _("Create objects"), preg_match('/c/', $currentAcl[0])).$spc;
-        $options.= $this->mkchkbx($key."_0_m", _("Move objects"), preg_match('/m/', $currentAcl[0])).$spc;
-        $options.= $this->mkchkbx($key."_0_d", _("Remove objects"), preg_match('/d/', $currentAcl[0])).$spc;
-        if ($plist[$key]['plSelfModify']){
-          $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
-        }
-      } else {
-        $options= $this->mkchkbx($key."_0_m", _("Move object"), preg_match('/m/', $currentAcl[0])).$spc;
-        $options.= $this->mkchkbx($key."_0_d", _("Remove object"), preg_match('/d/', $currentAcl[0])).$spc;
-        if ($plist[$key]['plSelfModify']){
-          $options.= $this->mkchkbx($key."_0_s", _("Modifyable by owner"), preg_match('/s/', $currentAcl[0])).$spc;
-        }
-      }
-
-      $display.= "<tr><td style='background-color:#E0E0E0' colspan=$cols>$options</td></tr>";
-
-      /* Walk through the list of attributes */
-      $cnt= 1;
-      $splist= $plist[$key];
-      asort($splist);
-      foreach($splist as $attr => $dsc){
-
-        /* Skip pl* attributes, they are internal... */
-        if (preg_match('/^pl[A-Z]+.*$/', $attr)){
-          continue;
-        }
-
-        /* Open table row */
-        if ($cnt == 1){
-          $display.= "<tr>";
-        }
-
-        /* Close table row */
-        if ($cnt == $cols){
-          $cnt= 1;
-          $rb= "";
-          $end= "</tr>";
-        } else {
-          $cnt++;
-          $rb= "border-right:1px solid #A0A0A0;";
-          $end= "";
-        }
-
-        /* Collect list of attributes */
-        $state= "";
-        if (isset($currentAcl[$attr])){
-          $state= $currentAcl[$attr];
-        }
-        $display.= "<td style='border-top:1px solid #A0A0A0;${rb}width:".(int)(100/$cols)."%'><b>$dsc</b> ($attr)<br>".$this->mkrwbx($key."_".$attr, $state)."</td>$end";
-      }
-      
-      /* Fill missing td's if needed */
-      if (--$cnt != $cols){
-       $display.= str_repeat("<td style='border-top:1px solid #A0A0A0'>&nbsp;</td>", $cols-$cnt); 
-      }
-
-      $display.= "</table><br>";
-    }
-
-    return ($display);
-  }
-
-
-  function mkchkbx($name, $text, $state= FALSE)
-  {
-    $state= $state?"checked":"";
-    return "<input id='acl_$name' type=checkbox name='acl_$name' $state><label for='acl_$name'>$text</label>";
-  }
-
-
-  function mkrwbx($name, $state= "")
-  {
-    $rstate= preg_match('/r/', $state)?'checked':'';
-    $wstate= preg_match('/w/', $state)?'checked':'';
-    return ("<input id='acl_${name}_r' type=checkbox name='acl_${name}_r' $rstate><label for='acl_${name}_r'>"._("read")."</label>".
-            "<input id='acl_${name}_w' type=checkbox name='acl_${name}_w' $wstate><label for='acl_${name}_w'>"._("write")."</label>");
-  }
-
-
-  function explodeACL($acl)
-  {
-    list($index, $type)= split(':', $acl);
-    $a= array( $index => array("type" => $type,
-                               "members" => $this->extractMembers($acl)));
-    
-    /* Handle different types */
-    switch ($type){
-
-      case 'psub':
-      case 'sub':
-      case 'one':
-      case 'base':
-        $a[$index]['acl']= $this->extractACL($acl);
-        break;
-      
-      case 'role':
-        echo "Role";
-        break;
-
-      case 'reset':
-        break;
-      
-      default:
-        print_red(sprintf(_("Unkown ACL type '%s'. Don't know how to handle it."), $type));
-        $a= array();
-    }
-    
-    return ($a);
-  }
-
-
-  function extractMembers($acl)
-  {
-    $a= array();
-
-    /* Rip acl off the string, seperate by ',' and place it in an array */
-    $ms= preg_replace('/^[^:]+:[^:]+:([^:]+).*$/', '\1', $acl);
-    if ($ms == $acl){
-      return $a;
-    }
-    $ma= split(',', $ms);
-
-    /* Decode dn's, fill with informations from LDAP */
-    $ldap= $this->config->get_ldap_link();
-    foreach ($ma as $memberdn){
-      $dn= base64_decode($memberdn);
-      $ldap->cat($dn, array('cn', 'objectClass', 'description', 'uid'));
-
-      /* Found entry... */
-      if ($ldap->count()){
-        $attrs= $ldap->fetch();
-        if (in_array_ics('gosaAccount', $attrs['objectClass'])){
-          $a['U:'.$dn]= $attrs['cn'][0]." [".$attrs['uid'][0]."]";
-        } else {
-          $a['G:'.$dn]= $attrs['cn'][0];
-          if (isset($attrs['description'][0])){
-            $a['G:'.$dn].= " [".$attrs['description'][0]."]";
-          }
-        }
-
-      /* ... or not */
-      } else {
-        $a['U:'.$dn]= sprintf(_("Unknown entry '%s'!"), $dn);
-      }
-    }
-
-    return ($a);
-  }
-
-
-  function extractACL($acl)
-  {
-    /* Rip acl off the string, seperate by ',' and place it in an array */
-    $as= preg_replace('/^[^:]+:[^:]+:[^:]+:(.*)$/', '\1', $acl);
-    $aa= split(',', $as);
-    $a= array();
-
-    /* Dis-assemble single ACLs */
-    foreach($aa as $sacl){
-      
-      /* Dis-assemble field ACLs */
-      $ao= split('#', $sacl);
-      $gobject= "";
-      foreach($ao as $idx => $ssacl){
-
-        /* First is department with global acl */
-        $object= preg_replace('/^([^;]+);.*$/', '\1', $ssacl);
-        $gacl=   preg_replace('/^[^;]+;(.*)$/', '\1', $ssacl);
-        if ($idx == 0){
-          /* Create hash for this object */
-          $gobject= $object;
-          $a[$gobject]= array();
-
-          /* Append ACL if set */
-          if ($gacl != ""){
-            $a[$gobject]= array($gacl);
-          }
-        } else {
-
-          /* All other entries get appended... */
-          list($field, $facl)= split(';', $ssacl);
-          $a[$gobject][$field]= $facl;
-        }
-
-      }
-    }
-
-    return ($a);
-  }
-
-  
-  function assembleAclSummary($entry)
-  {
-    $summary= "";
-
-    /* Summarize ACL */
-    if (isset($entry['acl'])){
-      $acl= "";
-      foreach ($entry['acl'] as $name => $object){
-        $acl.= "$name, ";
-      }
-      $summary.= sprintf(_("Contains settings for these objects: %s"), preg_replace('/, $/', '', $acl));
-    }
-
-    /* Summarize members */
-    if ($summary != ""){
-      $summary.= ", ";
-    }
-    if (count($entry['members'])){
-      $summary.= _("Members:")." ";
-      foreach ($entry['members'] as $cn){
-        $cn= preg_replace('/ \[.*$/', '', $cn);
-        $summary.= $cn.", ";
-      }
-    } else {
-      $summary.= _("ACLs is valid for all users");
-    }
-
-    return (preg_replace('/, $/', '', $summary));
-  }
-
-
-  function loadAclEntry($new= FALSE)
-  {
-    /* New entry gets presets... */
-    if ($new){
-      $this->aclType= 'base';
-      $this->recipients= array();
-      $this->aclContents= array();
-    } else {
-      $acl= $this->gosaAclEntry[$this->currentIndex];
-      $this->aclType= $acl['type'];
-      $this->recipients= $acl['members'];
-      $this->aclContents= $acl['acl'];
-    }
-
-    $this->wasNewEntry= $new;
-  }
-
-
-  function aclPostHandler()
-  {
-    if (isset($_POST['save_acl'])){
-      $this->save();
-      return TRUE;
-    }
-
-    return FALSE;
-  }
-
-
-  function save()
-  {
-    /* Assemble ACL's */
-    $tmp_acl= array();
-    foreach ($this->gosaAclEntry as $prio => $entry){
-      $final= "";
-      $members= "";
-      if (isset($entry['members'])){
-        foreach ($entry['members'] as $key => $dummy){
-          $members.= base64_encode(preg_replace('/^.:/', '', $key)).',';
-        }
-      }
-      $final= $prio.":".$entry['type'].":".preg_replace('/,$/', '', $members);
-
-      /* ACL's if needed */
-      if ($entry['type'] != "reset" && $entry['type'] != "role"){
-        $acl= ":";
-        if (isset($entry['acl'])){
-          foreach ($entry['acl'] as $object => $contents){
-            $acl.= $object.";";
-            
-            foreach($contents as $attr => $permission){
-
-              /* First entry? Its the one for global settings... */
-              if ($attr == '0'){
-                $acl.= $permission;
-              } else {
-                $acl.= '#'.$attr.';'.$permission;
-              }
-
-            }
-            $acl.= ',';
-            
-          }
-        }
-        $final.= preg_replace('/,$/', '', $acl);
-      }
-
-      $tmp_acl[]= $final;
-    } 
-
-    /* Call main method */
-    plugin::save();
-
-    /* Finally (re-)assign it... */
-    $this->attrs['gosaAclEntry']= $tmp_acl;
-
-    /* Remove acl from this entry if it is empty... */
-    if (!count($tmp_acl)){
-      /* Remove attribute */
-      if ($this->initially_was_account){
-        $this->attrs['gosaAclEntry']= array();
-      } else {
-        if (isset($this->attrs['gosaAclEntry'])){
-          unset($this->attrs['gosaAclEntry']);
-        }
-      }
-
-      /* Remove object class */
-      $this->attrs['objectClass']= array_remove_entries(array('gosaAcl'), $this->attrs['objectClass']);
-    }    
-
-    /* Do LDAP modifications */
-    $ldap= $this->config->get_ldap_link();
-    $ldap->cd($this->dn);
-    $this->cleanup();
-    $ldap->modify ($this->attrs);
-
-    show_ldap_error($ldap->get_error(), sprintf(_("Saving ACLs with dn '%s' failed."),$this->dn));
-  }
-
-
-  function remove_from_parent()
-  {
-    echo "remove_from_parent() called";
-  }
-
-}
-
-// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-?>
diff --git a/plugins/admin/acl/contents.tpl b/plugins/admin/acl/contents.tpl
deleted file mode 100644 (file)
index 84a108c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-{if $dialogState eq 'head'}
-<h1>{t}Assigned ACLs for current entry{/t}</h1>
-{$aclList}
-<input type="submit" name="new_acl" value="{t}New ACL{/t}">
-{/if}
-
-{if $dialogState eq 'create'}
-<h1>{t}ACL type{/t} <select size="1" name="aclType" title="{t}Select an acl type{/t}" onChange="document.mainform.submit()">&nbsp;</option>{html_options options=$aclTypes selected=$aclType}<option disabled></select>&nbsp;{if $javascript eq 'false'}<input type="submit" value="{t}Apply{/t}" name="refresh">{/if}</h1>
-
-<p class="seperator">&nbsp;</p>
-
-<table style="width:100%">
- <tr>
-  <td style="width:48%; vertical-align:top;">
-   {t}Use members from{/t}
-   <select name="target" onChange="document.mainform.submit()">
-        {html_options options=$targets selected=$target}
-        <option disabled>&nbsp;</option>
-   </select>
-   {if $javascript eq 'false'}<input type="submit" value="{t}Apply{/t}" name="refresh">{/if}<br><br>
-  </td>
-  <td>
-  </td>
-  <td>
-  </td>
- </tr>
- <tr>
-  <td style="width:48%">
-   {t}Available members{/t}<br>
-   <select style="width:100%;height:180px;" name="source[]" size="20" multiple title="{t}List message possible targets{/t}">
-            {html_options options=$sources}
-            <option disabled>&nbsp;</option>
-   </select>
-  </td>
-  <td style="vertical-align:center; text-align:center">
-   <input type="submit" value="&gt;" name="add">
-   <br><br>
-   <input type="submit" value="&lt;" name="del">
-  </td>
-  <td style="width:48%; vertical-align:top;">
-   {t}Members{/t}<br>
-   <select style="width:100%;height:180px;" name="recipient[]" size="20" multiple title="{t}List message recipients{/t}">
-            {html_options options=$recipients}
-            <option disabled>&nbsp;</option>
-   </select>
-  </td>
- </tr>
-</table>
-
-{if $aclType ne 'reset'}
-{if $aclType ne 'role'}
-{if $aclType ne 'base'}
-<p class="seperator">&nbsp;</p>
-
-<h1>{t}List of available ACL categories{/t}</h1>
-{$aclList}
-{/if}
-{/if}
-{/if}
-
-{if $aclType eq 'base'}
-<p class="seperator">&nbsp;</p>
-<h1>{t}ACLs for this object{/t}</h1>
-{$aclSelector}
-{/if}
-
-<p class="seperator">&nbsp;</p>
-<div style='text-align:right;margin-top:5px'>
-       <input type="submit" name="submit_new_acl" value="{t}Apply{/t}">
-       &nbsp;
-       <input type="submit" name="cancel_new_acl" value="{t}Cancel{/t}">
-</div>
-{/if}
-
-{if $dialogState eq 'edit'}
-
-<h1>{$headline}</h1>
-
-{$aclSelector}
-
-<p class="seperator">&nbsp;</p>
-<div style='text-align:right;margin-top:5px'>
-       <input type="submit" name="submit_edit_acl" value="{t}Apply{/t}">
-       &nbsp;
-       <input type="submit" name="cancel_edit_acl" value="{t}Cancel{/t}">
-</div>
-{/if}
index 35923c401c1f1b9607ca9bf81e4e4aa3729ff175..9206228a0cdfb5e8439a61d96a33fdec6ac3b7ed 100644 (file)
@@ -341,7 +341,7 @@ class department extends plugin
     
     /* Optionally execute a command after we're done */
                $this->postcreate();
-    return(true);
+    return(false);
        }