X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_acl.inc;h=853893edcd486e35178ebc96cee973e92e7d3f23;hb=b9fc1972cf2270252fc2a9940feab21c93372e94;hp=60634943f918293bb3aebadf1dddea1b07a4b2f7;hpb=dc1a5481ef23281a49eb25df40491b68ebd4b90f;p=gosa.git

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 60634943f..853893edc 100644
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -54,6 +54,11 @@ class acl extends plugin
   var $myAclObjects = array();
   var $acl_category = "acl/";
 
+  var $list =NULL;
+
+  var $sectionList = NULL;
+  var $roleList = NULL;
+
   function acl (&$config, $parent, $dn= NULL)
   {
     /* Include config object */
@@ -235,8 +240,67 @@ class acl extends plugin
 
     /* Finally - we want to get saved... */
     $this->is_account= TRUE;
+
+    $this->updateList();
+
+    // Prepare lists 
+    $this->sectionList = new sortableListing();
+    $this->sectionList->setDeleteable(false);
+    $this->sectionList->setEditable(false);
+    $this->sectionList->setWidth("100%");
+    $this->sectionList->setHeight("120px");
+    $this->sectionList->setColspecs(array('200px','*'));
+    $this->sectionList->setHeader(array(_("Section"),_("Description")));
+    $this->sectionList->setDefaultSortColumn(1);
+    $this->sectionList->setAcl('rwcdm'); // All ACLs, we filter on our own here.
+
+    $this->roleList = new sortableListing();
+    $this->roleList->setDeleteable(false);
+    $this->roleList->setEditable(false);
+    $this->roleList->setWidth("100%");
+    $this->roleList->setHeight("120px");
+    $this->roleList->setColspecs(array('20px','*','*'));
+    $this->roleList->setHeader(array(_("Used"),_("Name"),_("Description")));
+    $this->roleList->setDefaultSortColumn(1);
+    $this->roleList->setAcl('rwcdm'); // All ACLs, we filter on our own here.
   }
 
+    
+  function updateList()
+  {
+      if(!$this->list){ 
+          $this->list = new sortableListing($this->gosaAclEntry,array(),TRUE);
+          $this->list->setDeleteable(true);
+          $this->list->setEditable(true);
+          $this->list->setColspecs(array('*'));
+          $this->list->setWidth("100%");
+          $this->list->setHeight("400px");
+          $this->list->setAcl("rwcdm");
+          $this->list->setHeader(array(_("Member"),_("Permissions"),_("Type")));
+      }
+
+ 
+    // Add ACL entries to the listing 
+    $lData = array();
+    foreach($this->gosaAclEntry as $id => $entry){
+       $lData[] = $this->convertForListing($entry);
+    }    
+    $this->list->setListData($this->gosaAclEntry, $lData);
+  }
+   
+    
+  function convertForListing($entry)
+  {
+    $member = implode($entry['members'],", ");
+    if(isset($entry['acl']) && is_array($entry['acl'])){
+        $acl = implode(array_keys($entry['acl']),", ");
+    }else{
+        $acl="";
+    }
+    return(array('data' => array($member, $acl, $this->aclTypes[$entry['type']])));
+  }
+
+  
 
   function execute()
   {
@@ -258,15 +322,19 @@ class acl extends plugin
     $aclDialog= FALSE;
     $firstedit= FALSE;
 
+    // Get listing actions. Delete or Edit.
+    $this->list->save_object();
+    $lAction = $this->list->getAction();
+    $this->gosaAclEntry = array_values($this->list->getMaintainedData());
+
     /* Act on HTML post and gets here.
      */
-    if(isset($_GET['id']) && isset($_GET['act']) && $_GET['act'] == "edit"){
-      $id = trim($_GET['id']);
-      $this->dialogState= 'create';
-      $firstedit= TRUE;
-      $this->dialog= TRUE;
-      $this->currentIndex= $id;
-      $this->loadAclEntry();
+    if($lAction['action'] == "edit"){
+        $this->currentIndex = $this->list->getKey($lAction['targets'][0]);
+        $this->dialogState= 'create';
+        $firstedit= TRUE;
+        $this->dialog= TRUE;
+        $this->loadAclEntry();
     }
 
     foreach($_POST as $name => $post){
@@ -313,26 +381,6 @@ class acl extends plugin
         continue;
       }
 
-      /* Sorting... */
-      if (preg_match('/^sortup_[0-9]*$/', $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_[0-9]*$/', $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)){
         list($dummy, $object, $attribute, $value)= explode('_', $name);
@@ -357,6 +405,9 @@ class acl extends plugin
       if(isset($_POST['selected_role']) && $_POST['aclType'] == 'role'){
         $this->aclContents = "";
         $this->aclContents = base64_decode($_POST['selected_role']);
+      }else{
+          if(is_string($this->aclContents))
+              $this->aclContents = array();
       }
     }
 
@@ -469,96 +520,77 @@ class acl extends plugin
 
     /* Create templating instance */
     $smarty= get_smarty();
+    $smarty->assign("usePrototype", "true");
     $smarty->assign("acl_readable",$this->acl_is_readable(""));
     if(!$this->acl_is_readable("")){
       return ($smarty->fetch (get_template_path('acl.tpl')));
     }
 
     if ($this->dialogState == 'head'){
-      /* Draw list */
-      $aclList= new divSelectBox("aclList");
-      $aclList->SetHeight(450);
-      
-      /* Fill in entries */
-      foreach ($this->gosaAclEntry as $key => $entry){
-        if(!$this->acl_is_readable("")) continue;
-
-        $action ="";      
-
-        if($this->acl_is_readable("")){
-          $link = "<a href=?plug=".$_GET['plug']."&amp;id=".$key."&amp;act=edit>".$this->assembleAclSummary($entry)."</a>";
-        }else{
-          $link = $this->assembleAclSummary($entry);
-        }
-  
-        $field1= array("string" => $this->aclTypes[$entry['type']], "attach" => "style='width:150px'");
-        $field2= array("string" => $link);
-
-        if($this->acl_is_writeable("")){
-          $action.= image('images/lists/sort-up.png', 'sortup_'.$key,"","top");
-          $action.= image('images/lists/sort-down.png', 'sortdown_'.$key,"","bottom");
-        } 
-    
-        if($this->acl_is_readable("")){
-          $action.= image('images/lists/edit.png','acl_edit_'.$key,msgPool::editButton(_("ACL")));
-        }
-        if($this->acl_is_removeable("")){
-          $action.= image('images/lists/trash.png','acl_del_'.$key,msgPool::delButton(_("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());
+      $this->updateList();
+      $smarty->assign("aclList", $this->list->render());
     }
 
     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 $section => $dsc){
-        $summary= "";
-        foreach($this->ocMapping[$section] as $oc){
-          if (isset($this->aclContents[$oc]) && count($this->aclContents[$oc]) && isset($this->aclContents[$oc][0]) &&
-              $this->aclContents[$oc][0] != ""){
-
-            $summary.= "$oc, ";
-            continue;
-          }
-          if (isset($this->aclContents["$section/$oc"]) && count($this->aclContents["$section/$oc"])){
-            $summary.= "$oc, ";
-            continue;
-          }
-          if (isset($this->aclContents[$oc]) && !isset($this->aclContents[$oc][0]) && count($this->aclContents[$oc])){
-            $summary.= "$oc, ";
-          }
-        }
 
-        /* Set summary... */
-        if ($summary == ""){
-          $summary= '<i>'._("No ACL settings for this category!").'</i>';
-        } else {
-          $summary= sprintf(_("Contains ACLs for these objects: %s"), preg_replace('/, $/', '', $summary));
-        }
 
-        $actions ="";
-        if($this->acl_is_readable("")){
-          $actions.= image('images/lists/edit.png','cat_edit_'.$section, msgPool::editButton(_("category ACL")));
-        }
-        if($this->acl_is_removeable()){
-          $actions.= image('images/lists/trash.png','cat_del_'.$section, msgPool::delButton(_("category ACL")));
-        }   
-
-        $field1= array("string" => $dsc, "attach" => "style='width:100px'");
-        $field2= array("string" => $summary);
-        $field3= array("string" => $actions, "attach" => "style='border-right:0px;width:50px'");
-        $aclList->AddEntry(array($field1, $field2, $field3));
-      }
+        if($this->aclType != 'role'){
+
+            // Create a map of all used sections, this allows us to simply hide the remove button 
+            //  if no acl is configured for the given section 
+            // e.g. ';all;department/country;users/user;
+            $usedList = ";".implode(array_keys($this->aclContents),';').";";
+
+            /* Add settings for all categories to the (permanent) list */
+            $data = $lData = array();
+            foreach ($this->aclObjects as $section => $dsc){
+                $summary= "";
+                foreach($this->ocMapping[$section] as $oc){
+                    if (isset($this->aclContents[$oc]) && 
+                            count($this->aclContents[$oc]) && 
+                            isset($this->aclContents[$oc][0]) &&
+                            $this->aclContents[$oc][0] != ""){
+
+                        $summary.= "$oc, ";
+                        continue;
+                    }
+                    if (isset($this->aclContents["$section/$oc"]) && 
+                            count($this->aclContents["$section/$oc"])){
+                        $summary.= "$oc, ";
+                        continue;
+                    }
+                    if (isset($this->aclContents[$oc]) && 
+                            !isset($this->aclContents[$oc][0]) && 
+                            count($this->aclContents[$oc])){
+                        $summary.= "$oc, ";
+                    }
+                }
 
-      $smarty->assign("aclList", $aclList->DrawList());
+                /* Set summary... */
+                if ($summary == ""){
+                    $summary= '<i>'._("No ACL settings for this category!").'</i>';
+                } else {
+                    $summary= trim($summary,", ");
+                    $summary= " ".sprintf(_("ACLs for: %s"), $summary);
+                }
+
+                $actions ="";
+                if($this->acl_is_readable("")){
+                    $actions.= image('images/lists/edit.png','cat_edit_'.$section, 
+                            msgPool::editButton(_("category ACL")));
+                }
+                if($this->acl_is_removeable() && preg_match("/;".$section."(;|\/)/", $usedList)){
+                    $actions.= image('images/lists/trash.png','cat_del_'.$section, 
+                            msgPool::delButton(_("category ACL")));
+                }   
+                $data[] = $section;
+                $lData[] = array('data'=>array($dsc, $summary, $actions));
+            }
+            $this->sectionList->setListData($data,$lData);
+            $this->sectionList->update();
+            $smarty->assign("aclList", $this->sectionList->render());
+        }
+    
       $smarty->assign("aclType", $this->aclType);
       $smarty->assign("aclFilter", $this->aclFilter);
       $smarty->assign("aclTypes", $this->aclTypes);
@@ -596,13 +628,12 @@ class acl extends plugin
 
       /* Role selector if scope is base */
       if ($this->aclType == 'role'){
-        $smarty->assign('roleSelector', "Role selector");#, $this->buildRoleSelector($this->myAclObjects));
         $smarty->assign('roleSelector', $this->buildRoleSelector($this->roles));
       }
     }
 
     if ($this->dialogState == 'edit'){
-      $smarty->assign('headline', sprintf(_("Edit ACL for '%s' - scope is '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType]));
+      $smarty->assign('headline', sprintf(_("Edit ACL for '%s' with scope '%s'"), $this->aclObjects[$this->aclObject], $this->aclTypes[$this->aclType]));
 
       /* Collect objects for selected category */
       foreach ($this->ocMapping[$this->aclObject] as $idx => $class){
@@ -665,29 +696,24 @@ class acl extends plugin
 
   function buildRoleSelector($list)
   {
-    $D_List =new divSelectBox("Acl_Roles");
- 
     $selected = $this->aclContents;
     if(!is_string($this->aclContents) || !isset($list[$this->aclContents])){
       $selected = key($list);
     }
 
-    $str ="";
+    $data = $lData = array();
     foreach($list as $dn => $values){
-
       if($dn == $selected){    
         $option = "<input type='radio' name='selected_role' value='".base64_encode($dn)."' checked>";
       }else{
         $option = "<input type='radio' name='selected_role' value='".base64_encode($dn)."'>";
       }
- 
-      $field1 = array("string" => $option) ;
-      $field2 = array("string" => $values['cn'], "attach" => "style='width:200px;'") ;
-      $field3 = array("string" => $values['description'],"attach" => "style='border-right:0px;'") ;
-
-      $D_List->AddEntry(array($field1,$field2,$field3));
+      $data[] = postEncode($dn);
+      $lData[] = array('data'=>array($option, $values['cn'], $values['description']));
     }
-    return($D_List->DrawList());
+    $this->roleList->setListData($data,$lData);
+    $this->roleList->update();
+    return($this->roleList->render());
   } 
 
 
@@ -920,9 +946,13 @@ class acl extends plugin
     if(count($list) == 5){
       list($index, $type,$member,$permission,$filter)= $list;
       $filter = base64_decode($filter);
-    }else{
+    }elseif(count($list) == 4){
       $filter = "";
       list($index, $type,$member,$permission)= $list;
+    }else{
+      $permission = "";
+      $filter = "";
+      list($index, $type,$member)= $list;
     }
 
     $a= array( $index => array("type" => $type,
@@ -1056,9 +1086,9 @@ class acl extends plugin
       if($entry['type'] == "role"){
 
         if(isset($this->roles[$entry['acl']])){  
-          $summary.= sprintf(_("Role: %s"), $this->roles[$entry['acl']]['cn']);
+          $summary.= sprintf(_("ACL role: %s"), $this->roles[$entry['acl']]['cn']);
         }else{
-          $summary.= sprintf(_("Role: %s"), "<i>"._("unknown role")."</i>");
+          $summary.= sprintf(_("ACL role: %s"), "<i>"._("unknown ACL role")."</i>");
         }
       }else{
         foreach ($entry['acl'] as $name => $object){
@@ -1102,7 +1132,7 @@ class acl extends plugin
       $acl= $this->gosaAclEntry[$this->currentIndex];
       $this->aclType= $acl['type'];
       $this->recipients= $acl['members'];
-      $this->aclContents= $acl['acl'];
+      $this->aclContents= (isset($acl['acl'])) ? $acl['acl'] :"";
       $this->aclFilter= $acl['filter'];
     }
 
@@ -1152,8 +1182,9 @@ class acl extends plugin
       }
 
       /* ACL's if needed */
+      $final.= ":";
       if ($entry['type'] != "reset" && $entry['type'] != "role"){
-        $acl= ":";
+        $acl = "";
         if (isset($entry['acl'])){
           foreach ($entry['acl'] as $object => $contents){
 
@@ -1186,7 +1217,7 @@ class acl extends plugin
       }
 
       $tmp_acl[]= $final;
-    } 
+    }
 
     /* Call main method */
     plugin::save();
@@ -1261,8 +1292,7 @@ class acl extends plugin
           "plCategory"    => array("acl" => array("description"  => _("ACL")."&nbsp;&amp;&nbsp;"._("ACL roles"),
                                                           "objectClass"  => array("gosaAcl","gosaRole"))),
           "plProvidedAcls"=> array(
-//            "cn"          => _("Role name"),
-//            "description" => _("Role description")
+           "gosaAclEntry"          => _("ACL Entries")
             )
 
           ));
@@ -1349,6 +1379,12 @@ class acl extends plugin
     }
   }
 
+  
+  // We are only interessted in our own acls ... 
+  function set_acl_category($category)
+  {
+    plugin::set_acl_category("acl");
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: