Code

Applied planned layout modifications
[gosa.git] / plugins / gofax / blocklists / class_blocklistManagement.inc
index bc9bd46ea9c77168a8377ac455e17314df15e284..f9a4533ae82c704f51e97d64beb8dc7720b4741d 100644 (file)
@@ -26,423 +26,574 @@ class blocklist extends plugin
 
   function blocklist ($config, $ui)
   {
-       $this->ui= $ui;
-       $this->dn= "";
-       $this->config= $config;
-
-        /* Get global filter config */
-        if (!is_global("blockfilter")){
-                $ui= get_userinfo();
-                $base= get_base_from_people($ui->dn);
-                $blockfilter= array("sendlists" => "checked",
-                                "receivelists" => "checked",
-                                "entry" => "*",
-                                "depselect" => $base,
-                                "regex" => "*");
-                register_global("blockfilter", $blockfilter);
-        }
+    $this->ui= $ui;
+    $this->dn= "";
+    $this->config= $config;
+
+    /* Get global filter config */
+    if (!is_global("blockfilter")){
+      $ui= get_userinfo();
+      $base= get_base_from_people($ui->dn);
+      $blockfilter= array("sendlists" => "checked",
+          "receivelists" => "checked",
+          "entry" => "*",
+          "depselect" => $base,
+          "regex" => "*");
+      register_global("blockfilter", $blockfilter);
+    }
 
   }
 
   function execute()
   {
-       /* Get global smarty instance */
-       $smarty= get_smarty();
-
-        /* Save data */
-        $blockfilter= get_global("blockfilter");
-        foreach( array("depselect", "entry", "regex") as $type){
-                if (isset($_POST[$type])){
-                        $blockfilter[$type]= $_POST[$type];
-                }
+    /* Get global smarty instance */
+    $smarty= get_smarty();
+    $blockfilter   = get_global("blockfilter"); // contains Filter Settings
+    $s_action     = "";                       // Contains the action to proceed
+    $s_entry      = "";                       // The value for s_action
+    $base_back    = "";                       // The Link for Backbutton
+
+    /* Start for New List Managment */
+    if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
+      $s_action="open";
+      $s_entry = base64_decode($_GET['dep_id']);
+      $blockfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+      $this->reload();
+    }
+
+    /* Test Posts */
+    foreach($_POST as $key => $val){
+      // Post for delete
+      if(preg_match("/user_del.*/",$key)){
+        $s_action = "del";
+        $s_entry  = preg_replace("/user_".$s_action."_/i","",$key);
+        // Post for edit
+      }elseif(preg_match("/user_edit_.*/",$key)){
+        $s_action="edit";
+        $s_entry  = preg_replace("/user_".$s_action."_/i","",$key);
+        // Post for new
+      }elseif(preg_match("/dep_back.*/i",$key)){
+        $s_action="back";
+      }elseif(preg_match("/user_new.*/",$key)){
+        $s_action="new";
+      }elseif(preg_match("/dep_home.*/i",$key)){
+        $s_action="home";
+      }elseif(preg_match("/user_tplnew.*/i",$key)){
+        $s_action="new_tpl";
+      }elseif(preg_match("/user_chgpw.*/i",$key)){
+        $s_action="change_pw";
+        $s_entry  = preg_replace("/user_chgpw_/i","",$key);
+      }elseif(preg_match("/dep_root.*/i",$key)){
+        $s_action="root";
+      }
+    }
+
+
+
+    if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){
+      $s_action ="edit";
+      $s_entry  = $_GET['id'];
+    }
+
+    $s_entry  = preg_replace("/_.$/","",$s_entry);
+
+    /* Department changed? */
+    if(isset($_POST['depselect']) && $_POST['depselect']){
+      $blockfilter['depselect']= $_POST['depselect'];
+      $this->reload();
+    }
+
+    /* Homebutton is posted */
+    if($s_action=="home"){
+      $blockfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
+      $blockfilter['depselect']=(preg_replace("/^[^,]+,/","",$blockfilter['depselect']));
+      $this->reload();
+    }
+
+    if($s_action=="root"){
+      $blockfilter['depselect']=($this->config->current['BASE']);
+      $this->reload();
+    }
+    
+    /* If Backbutton is Posted */
+    if($s_action=="back"){
+      $base_back          = preg_replace("/^[^,]+,/","",$blockfilter['depselect']);
+      $base_back          = convert_department_dn($base_back);
+
+      if(isset($this->config->departments[trim($base_back)])){
+        $blockfilter['depselect']= $this->config->departments[trim($base_back)];
+      }else{
+        $blockfilter['depselect']= $this->config->departments["/"];
+      }
+      $this->reload();
+    }
+
+    register_global("blockfilter", $blockfilter);
+
+    /* Save data */
+    $blockfilter= get_global("blockfilter");
+    foreach( array( "entry", "regex") as $type){
+      if (isset($_POST[$type])){
+        $blockfilter[$type]= $_POST[$type];
+      }
+    }
+    if (isset($_POST['depselect'])){
+      foreach( array("sendlists", "receivelists") as $type){
+
+        if (isset($_POST[$type])) {
+          $blockfilter[$type]= "checked";
+        } else {
+          $blockfilter[$type]= "";
         }
-        if (isset($_POST['depselect'])){
-                foreach( array("sendlists", "receivelists") as $type){
-
-                        if (isset($_POST[$type])) {
-                                $blockfilter[$type]= "checked";
-                        } else {
-                                $blockfilter[$type]= "";
-                        }
-                }
+      }
+    }
+    if (isset($_GET['search'])){
+      $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
+      if ($s == "**"){
+        $s= "*";
+      }
+      $blockfilter['regex']= $s;
+    }
+    register_global("blockfilter", $blockfilter);
+
+    /* Create new blocklist? */
+    if ($s_action=="new"){
+      $this->clear_fields();
+      $this->acl= "#all#";
+      $this->dn= "new";
+      plugin::plugin ($this->config, $this->dn);
+    }
+
+    /* Edit selected blocklist? */
+    if ($s_action=="edit"){
+      $this->clear_fields();
+      $this->dn=$this->blocklists[$s_entry]['dn']; 
+      $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+      $this->acl= get_module_permission($this->acl, "blocklists", $this->dn);
+      plugin::plugin ($this->config, $this->dn);
+
+      /* Load missing lists */
+      if (isset($this->attrs["goFaxSBlocklist"])){
+        for ($i= 0; $i<$this->attrs["goFaxSBlocklist"]["count"]; $i++){
+          $this->goFaxBlocklist[]= $this->attrs["goFaxSBlocklist"][$i];
         }
-        if (isset($_GET['search'])){
-                $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
-                if ($s == "**"){
-                        $s= "*";
-                }
-                $blockfilter['regex']= $s;
+        $this->type= 0;
+      } elseif (isset($this->attrs["goFaxRBlocklist"])){
+        for ($i= 0; $i<$this->attrs["goFaxRBlocklist"]["count"]; $i++){
+          $this->goFaxBlocklist[]= $this->attrs["goFaxRBlocklist"][$i];
         }
-        register_global("blockfilter", $blockfilter);
-
-       /* Create new blocklist? */
-       if (isset($_POST['new_blocklist'])){
-               $this->clear_fields();
-               $this->acl= "#all#";
-               $this->dn= "new";
-               plugin::plugin ($this->config, $this->dn);
-       }
-
-       /* Edit selected blocklist? */
-       if ((isset($_POST['select_blocklist']) || (isset($_POST['edit_helper']) && $_POST['edit_helper'] == "1")) && isset($_POST['blocklist']) != ""){
-               $this->clear_fields();
-               $this->dn= trim($_POST['blocklist']);
-               $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-               $this->acl= get_module_permission($this->acl, "blocklists", $this->dn);
-               plugin::plugin ($this->config, $this->dn);
-
-               /* Load missing lists */
-               if (isset($this->attrs["goFaxSBlocklist"])){
-                       for ($i= 0; $i<$this->attrs["goFaxSBlocklist"]["count"]; $i++){
-                               $this->goFaxBlocklist[]= $this->attrs["goFaxSBlocklist"][$i];
-                       }
-                       $this->type= 0;
-               } elseif (isset($this->attrs["goFaxRBlocklist"])){
-                       for ($i= 0; $i<$this->attrs["goFaxRBlocklist"]["count"]; $i++){
-                               $this->goFaxBlocklist[]= $this->attrs["goFaxRBlocklist"][$i];
-                       }
-                       $this->type= 1;
-               }
-               $_SESSION['objectinfo']= trim($this->dn);
-       }
-
-       /* Delete blocklist requested */
-       if (isset($_POST['delete_blocklist']) && isset($_POST['blocklist'])){
-               $this->dn= trim($_POST['blocklist']);
-
-               /* Check locking */
-               if (($user= get_lock($this->dn)) != ""){
-                       $_SESSION['dn']= $this->dn;
-                       return(gen_locked_message($user, $this->dn));
-               } else {
-                       # Lock this dn for editing
-                       add_lock ($this->dn, $this->ui->dn);
-
-                       $smarty->assign("info", sprintf(_("You're about to delete the blocklist '%s'."), $this->dn));
-                       return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
-               }
-       }
-
-       /* Finally delete blocklist */
-       if (isset($_POST['delete_blocklist_confirm'])){
-               $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-               $acl= get_module_permission($acl, "blocklists", $this->dn);
-               if (chkacl($acl, "all") == ""){
-                       $this->remove_from_parent();
-                       gosa_log ("Blocklist object'".$this->dn."' has been removed");
-                       $this->reload ();
-               } else {
-                       print_red (_("You have no permission to remove this blocklist."));
-               }
-       }
-
-       /* Cancel dialog */
-       if (isset($_POST['edit_cancel']) || isset($_POST['delete_blocklist_cancel']) ||
-               isset($_POST['delete_blocklist_confirm']) || isset($_POST['delete_lock'])){
-
-               del_lock ($this->dn);
-               $this->clear_fields();
-               unset($_SESSION['objectinfo']);
-       }
-
-       /* Handle interactions: add */
-       if (isset($_POST['add_number']) && $_POST['number'] != ""){
-               if (is_phone_nr($_POST['number'])){
-                       $this->addNumber ($_POST['number']);
-               } else {
-                       print_red (_("Please specify a valid phone number."));
-               }
-       }
-
-       /* Handle interactions: delete */
-       if (isset($_POST['delete_number']) && count($_POST['numbers']) > 0){
-               $this->delNumber ($_POST['numbers']);
-       }
-
-       /* What about finish? */
-       if (isset($_POST['edit_finish'])){
-               $message= $this->check();
-
-               /* No errors, save object */
-               if (count ($message) == 0){
-
-                       /* Perpare 'dn' in case of new entries */
-                       if ($this->dn == "new"){
-                               $this->dn= "cn=$this->cn,ou=gofax,ou=systems,".$this->base;
-                       }
-
-                       $this->save ();
-                       gosa_log ("Blocklist object'".$this->dn."' has been saved");
-                       $this->acl= "#none#";
-                       $this->dn= "";
-                       del_lock ($this->ui->dn);
-                       unset($_SESSION['objectinfo']);
-               } else {
-                       /* Errors found, show message */
-                       show_errors ($message);
-               }
-       }
-       
-       /* Headpage or normal plugin screen? */
-       if ($this->dn == ""){
-               /* Check sorting variable */
-               $this->reload();
-
-               /* Check for exeeded sizelimit */
-               if (($message= check_sizelimit()) != ""){
-                       return($message);
-               }
-
-               /* Show main page */
-               $smarty->assign("blocklists", $this->blocklists);
-               $smarty->assign("search_image", get_template_path('images/search.png'));
-               $smarty->assign("tree_image", get_template_path('images/tree.png'));
-               $smarty->assign("infoimage", get_template_path('images/info.png'));
-               $smarty->assign("launchimage", get_template_path('images/launch.png'));
-               $smarty->assign("apply", apply_filter());
-               foreach( array("depselect", "entry", "regex", "sendlists", "receivelists") as $type){
-                       $smarty->assign("$type", $blockfilter[$type]);
-               }
-               $smarty->assign("deplist", $this->config->idepartments);
-               $smarty->assign("alphabet", generate_alphabet());
-               $smarty->assign("hint", print_sizelimit_warning());
-
-               return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
-       }
-
-       /* Set base */
-       if ($this->base == ""){
-               if ($this->dn == "new"){
-                       $ui= get_userinfo();
-                       $this->base= dn2base($ui->dn);
-               } else {
-                       $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
-               }
-       }
-
-       /* Fill templating stuff */
-       $smarty->assign("bases", $this->config->idepartments);
-       $smarty->assign("base_select", $this->base);
-       $smarty->assign("types", array(0 => _("send"), 1 => _("receive")));
-        if ($this->dn == "new" || preg_match ("/,ou=incoming,/", $this->dn)){
-                $smarty->assign("selectmode", "");
-                $smarty->assign("mode", "");
-        } else {
-                $smarty->assign("selectmode", "disabled");
-                $smarty->assign("mode", "readonly");
+        $this->type= 1;
+      }
+      $_SESSION['objectinfo']= trim($this->dn);
+    }
+
+    /* Delete blocklist requested */
+    if ($s_action=="del"){
+      $this->dn=$this->blocklists[$s_entry]['dn'];
+      /* Check locking */
+      if (($user= get_lock($this->dn)) != ""){
+        $_SESSION['dn']= $this->dn;
+        return(gen_locked_message($user, $this->dn));
+      } else {
+# Lock this dn for editing
+        add_lock ($this->dn, $this->ui->dn);
+
+        $smarty->assign("info", sprintf(_("You're about to delete the blocklist '%s'."), $this->dn));
+        return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
+      }
+    }
+
+    /* Finally delete blocklist */
+    if (isset($_POST['delete_blocklist_confirm'])){
+      $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
+      $acl= get_module_permission($acl, "blocklists", $this->dn);
+      if (chkacl($acl, "all") == ""){
+        $this->remove_from_parent();
+        gosa_log ("Blocklist object'".$this->dn."' has been removed");
+        $this->reload ();
+      } else {
+        print_red (_("You have no permission to remove this blocklist."));
+      }
+    }
+
+    /* Cancel dialog */
+    if (isset($_POST['edit_cancel']) || isset($_POST['delete_blocklist_cancel']) ||
+        isset($_POST['delete_blocklist_confirm']) || isset($_POST['delete_lock'])){
+
+      del_lock ($this->dn);
+      $this->clear_fields();
+      unset($_SESSION['objectinfo']);
+    }
+
+    /* Handle interactions: add */
+    if (isset($_POST['add_number']) && $_POST['number'] != ""){
+      if (is_phone_nr($_POST['number'])){
+        $this->addNumber ($_POST['number']);
+      } else {
+        print_red (_("Please specify a valid phone number."));
+      }
+    }
+
+    /* Handle interactions: delete */
+    if (isset($_POST['delete_number']) && count($_POST['numbers']) > 0){
+      $this->delNumber ($_POST['numbers']);
+    }
+
+    /* What about finish? */
+    if (isset($_POST['edit_finish'])){
+      $message= $this->check();
+
+      /* No errors, save object */
+      if (count ($message) == 0){
+
+        /* Perpare 'dn' in case of new entries */
+        if ($this->dn == "new"){
+          $this->dn= "cn=$this->cn,ou=gofax,ou=systems,".$this->base;
         }
-       foreach(array("cn", "description", "type", "goFaxBlocklist") as $val){
-               $smarty->assign("$val", $this->$val);
-               $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
-       }
-
-       /* Lock blocklist type for non new entries */
-       if ($this->dn != "new"){
-               $smarty->assign('typeACL', "disabled");
-       }
-
-       /* Show main page */
-       return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
+
+        $this->save ();
+        gosa_log ("Blocklist object'".$this->dn."' has been saved");
+        $this->acl= "#none#";
+        $this->dn= "";
+        del_lock ($this->ui->dn);
+        unset($_SESSION['objectinfo']);
+      } else {
+        /* Errors found, show message */
+        show_errors ($message);
+      }
+    }
+
+    /* Headpage or normal plugin screen? */
+    if ($this->dn == ""){
+      /* Check sorting variable */
+      $this->reload();
+
+      /* Check for exeeded sizelimit */
+      if (($message= check_sizelimit()) != ""){
+        return($message);
+      }
+
+   $options= "";
+    foreach ($this->config->idepartments as $key => $value){
+            if ($blockfilter['depselect'] == $key){
+                    $options.= "<option selected value='$key'>$value</option>";
+            } else {
+                    $options.= "<option value='$key'>$value</option>";
+            }
+    }
+
+
+
+      /* NEW LIST MANAGMENT */
+      $listhead = "<div style='background:#F0F0F9;padding:5px;'>".
+        " <input type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+        " <input type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+        " <input type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+        " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+        " <input type='image' align='middle' src='images/list_new_blocklist.png' title='"._("Create new blocklist")."' alt='"._("New Blocklist")."' name='user_new'>&nbsp;".
+        " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;"._("Current base")."&nbsp;<select name='depselect' onChange='mainform.submit()'>$options</select>".
+        " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+        "</div>";
+
+      $action= "<input type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit user")."'>";
+      $action.= "<input type='image' src='images/editdelete.png' alt='"._("delete")."'   name='user_del_%KEY%' title='"._("Delete user")."'>";
+
+
+      $divlist = new divlist();
+      $divlist->SetHeader(array(
+            array("string" => "&nbsp;"),
+            array("string" => _("Blocklist name")." / "._("Department")),
+            array("string" => _("Actions"), "attach" => "style='border:none'" )));
+
+
+      $divlist->SetSummary(_("This table displays faxblocklists for the selected tree."));
+      $divlist->SetEntriesPerPage(20);
+
+      // Defining Links
+      $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
+      foreach($this->departments as $key=> $val){
+        $field1 = array("string" => "<img src='images/folder.png' alt='department'>");
+        $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val));
+        $field3 = array("string" => "&nbsp;", "attach" => "style='border:none'");
+        $divlist->AddEntry(array($field1,$field2,$field3));
+      }
+
+      // User and Template  Images
+      $blockimg = "<img src='images/list_blocklist.png' alt='User' title='%s'>";
+      $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
+
+      foreach($this->blocklists as $key => $val){
+        // Generate Array to Add
+        $display= "[".$val["cn"][0]."]";
+        $field1 = array("string" => sprintf($blockimg,$val['dn']),"attach"=>"style='width:20px;align:middle;'");
+        $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'");
+        $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none; text-align:right;width:40px'");
+        $divlist->AddEntry( array($field1,$field2,$field3));
+      }
+
+      /* Show main page */
+      $smarty->assign("blocklistshead", $listhead);
+      $smarty->assign("blocklists", $divlist->DrawList());
+      $smarty->assign("search_image", get_template_path('images/search.png'));
+      $smarty->assign("tree_image", get_template_path('images/tree.png'));
+      $smarty->assign("infoimage", get_template_path('images/info.png'));
+      $smarty->assign("launchimage", get_template_path('images/launch.png'));
+      $smarty->assign("apply", apply_filter());
+      foreach( array("depselect", "entry", "regex", "sendlists", "receivelists") as $type){
+        $smarty->assign("$type", $blockfilter[$type]);
+      }
+      $smarty->assign("deplist", $this->config->idepartments);
+      $smarty->assign("alphabet", generate_alphabet());
+      $smarty->assign("hint", print_sizelimit_warning());
+
+      return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
+    }
+
+    /* Set base */
+    if ($this->base == ""){
+      if ($this->dn == "new"){
+        $ui= get_userinfo();
+        $this->base= dn2base($ui->dn);
+      } else {
+        $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
+      }
+    }
+
+    /* Fill templating stuff */
+    $smarty->assign("bases", $this->config->idepartments);
+    $smarty->assign("base_select", $this->base);
+    $smarty->assign("types", array(0 => _("send"), 1 => _("receive")));
+    if ($this->dn == "new" || preg_match ("/,ou=incoming,/", $this->dn)){
+      $smarty->assign("selectmode", "");
+      $smarty->assign("mode", "");
+    } else {
+      $smarty->assign("selectmode", "disabled");
+      $smarty->assign("mode", "readonly");
+    }
+    foreach(array("cn", "description", "type", "goFaxBlocklist") as $val){
+      $smarty->assign("$val", $this->$val);
+      $smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
+    }
+
+    /* Lock blocklist type for non new entries */
+    if ($this->dn != "new"){
+      $smarty->assign('typeACL', "disabled");
+    }
+
+    /* Show main page */
+    return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
   }
 
   function clear_fields()
   {
-       $this->dn= "";
-       $this->description= "";
-       $this->cn= "";
-       $this->base= "";
-       $this->goFaxBlocklist= array();
-       $this->acl= "#none#";
+    $this->dn= "";
+    $this->description= "";
+    $this->cn= "";
+    $this->base= "";
+    $this->goFaxBlocklist= array();
+    $this->acl= "#none#";
   }
 
   function reload()
   {
-       /* Get config */
-        $blockfilter= get_global('blockfilter');
-
-        /* Set base for all searches */
-        $base= $blockfilter['depselect'];
-       $filter= "";
-
-        /* Regex filter? */
-        if ($blockfilter['regex'] != ""){
-                $regex= $blockfilter['regex'];
-        } else {
-                $regex= "*";
-        }
-
-        /* Entry filter? */
-        /* Get list of blocklists to be shown */
-        if ($blockfilter['sendlists'] == "checked"){
-               $filter.= "(objectClass=goFaxSBlock)";
-        }
-        if ($blockfilter['receivelists'] == "checked"){
-               $filter.= "(objectClass=goFaxRBlock)";
-        }
-       if ($filter != ""){
-               $filter= "(|$filter)";
-       }
-
-        if ($blockfilter['entry'] != "" && $blockfilter['entry'] != "*"){
-                $filter.= "(|(goFaxSBlocklist=".$blockfilter['entry'].")(goFaxRBlocklist=".$blockfilter['entry']."))";
-        }
-
-       /* Generate blocklists */
-       $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)$filter)", TRUE, $base, array("cn", "description"));
-
-       $this->blocklists= array();
-       foreach ($res as $value){
-
-               /* Unwanted? */
-               $this->blocklists[$value["dn"]]= $value["cn"][0];
-               if (isset($value["description"][0])){
-                       $this->blocklists[$value["dn"]]= $value["cn"][0]." (".
-                                               $value["description"][0].")";
-               }
-       }
-       natcasesort ($this->blocklists);
-       reset ($this->blocklists);
+    /* Get config */
+    $blockfilter= get_global('blockfilter');
+
+    /* Set base for all searches */
+    $base= $blockfilter['depselect'];
+    $filter= "";
+
+    /* Regex filter? */
+    if ($blockfilter['regex'] != ""){
+      $regex= $blockfilter['regex'];
+    } else {
+      $regex= "*";
+    }
+
+    /* Entry filter? */
+    /* Get list of blocklists to be shown */
+    if ($blockfilter['sendlists'] == "checked"){
+      $filter.= "(objectClass=goFaxSBlock)";
+    }
+    if ($blockfilter['receivelists'] == "checked"){
+      $filter.= "(objectClass=goFaxRBlock)";
+    }
+    if ($filter != ""){
+      $filter= "(|$filter)";
+    }
+
+    if ($blockfilter['entry'] != "" && $blockfilter['entry'] != "*"){
+      $filter.= "(|(goFaxSBlocklist=".$blockfilter['entry'].")(goFaxRBlocklist=".$blockfilter['entry']."))";
+    }
+
+    /* Generate blocklists */
+    $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)$filter)", TRUE, $base, array("*"));
+
+    $this->blocklists=$res;
+
+    /* NEW LIST MANAGMENT
+     * We also need to search for the departments
+     * So we are able to navigate like in konquerer
+     */
+    $base2 = preg_replace("/ou=people,/i","",$base);
+
+    $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
+        TRUE, $base2, array("ou", "description"), TRUE);
+
+    $this->departments= array();
+    foreach ($res3 as $value){
+      if($value["description"][0]!=".."){
+        $this->departments[$value['dn']]= convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+      }else{
+        $this->departments[$value['dn']]=$value["description"][0];
+      }
+    }
+
+    /* END NEW LIST MANAGMENT
+     */
+
+    reset ($this->blocklists);
   }
 
   function remove_from_parent()
   {
-       $ldap= $this->config->get_ldap_link();
-       $ldap->rmDir($this->dn);
-       $this->handle_post_events("remove");
+    $ldap= $this->config->get_ldap_link();
+    $ldap->rmDir($this->dn);
+    $this->handle_post_events("remove");
   }
 
 
   /* Save data to object */
   function save_object()
   {
-       plugin::save_object();
-       
-       /* Save type, needed to detect objectClass */
-       if (isset($_POST['type']) && chkacl($this->acl, "cn") == ""){
-               $this->type= $_POST['type'];
-       }
-
-        /* Save base, since this is no LDAP attribute */
-        if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
-                $this->base= $_POST['base'];
-        }
+    plugin::save_object();
+
+    /* Save type, needed to detect objectClass */
+    if (isset($_POST['type']) && chkacl($this->acl, "cn") == ""){
+      $this->type= $_POST['type'];
+    }
+
+    /* Save base, since this is no LDAP attribute */
+    if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
+      $this->base= $_POST['base'];
+    }
   }
 
 
   /* Check values */
   function check()
   {
-       $message= array();
-
-       /* Permissions for that base? */
-       if ($this->base != ""){
-               $new_dn= "cn=".$this->cn.",ou=gofax,ou=systems,".$this->base;
-       } else {
-               $new_dn= $this->dn;
-       }
-
-       $ui= get_userinfo();
-       $acl= get_permissions ($new_dn, $ui->subtreeACL);
-       $acl= get_module_permission($acl, "blocklist", $new_dn);
-       if (chkacl($acl, "create") != ""){
-               $message[]= _("You have no permissions to create a blocklist on this 'Base'.");
-       }
-
-
-       /* check syntax: must cn */
-       if ($this->cn == ""){
-               $message[]= _("Required field 'Name' is not set.");
-       } else {
-               if (!is_uid($this->cn)){
-                       $message[]= _("Required field 'Name' contains invalid characters");
-               }
-               if ($this->dn == 'new'){
-                       $ldap= $this->config->get_ldap_link();
-                       $ldap->cd ("ou=gofax,ou=systems,".$this->config->current["BASE"]);
-                       $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))".
-                                       "(cn=".$this->cn."))", array("cn"));
-                       if ($ldap->count() != 0){
-                               $message[]= _("Specified name is already used.");
-                       }
-               }
-       }
-
-       /* Is user allowed to create in 'base'? */
-       if (chkacl($this->acl, "create") != ""){
-               $message[]= _("No permission to create a blocklist on this base.");
-       }
-
-       return $message;
+    $message= array();
+
+    /* Permissions for that base? */
+    if ($this->base != ""){
+      $new_dn= "cn=".$this->cn.",ou=gofax,ou=systems,".$this->base;
+    } else {
+      $new_dn= $this->dn;
+    }
+
+    $ui= get_userinfo();
+    $acl= get_permissions ($new_dn, $ui->subtreeACL);
+    $acl= get_module_permission($acl, "blocklist", $new_dn);
+    if (chkacl($acl, "create") != ""){
+      $message[]= _("You have no permissions to create a blocklist on this 'Base'.");
+    }
+
+
+    /* check syntax: must cn */
+    if ($this->cn == ""){
+      $message[]= _("Required field 'Name' is not set.");
+    } else {
+      if (!is_uid($this->cn)){
+        $message[]= _("Required field 'Name' contains invalid characters");
+      }
+      if ($this->dn == 'new'){
+        $ldap= $this->config->get_ldap_link();
+        $ldap->cd ("ou=gofax,ou=systems,".$this->config->current["BASE"]);
+        $ldap->search ("(&(|(objectClass=goFaxSBlock)(objectClass=goFaxRBlock))".
+            "(cn=".$this->cn."))", array("cn"));
+        if ($ldap->count() != 0){
+          $message[]= _("Specified name is already used.");
+        }
+      }
+    }
+
+    /* Is user allowed to create in 'base'? */
+    if (chkacl($this->acl, "create") != ""){
+      $message[]= _("No permission to create a blocklist on this base.");
+    }
+
+    return $message;
   }
 
 
   /* Save to LDAP */
   function save()
   {
-       plugin::save();
-
-       /* Type selection */
-       if ($this->type == 0){
-               $type= "goFaxSBlock";
-       } else {
-               $type= "goFaxRBlock";
-       }
-
-       /* Add list */
-       $this->attrs['objectClass']= $type;
-       if (count($this->goFaxBlocklist)){
-               $this->attrs["$type"."list"]= $this->goFaxBlocklist;
-       }
-
-       /* Write back to ldap */
-       $ldap= $this->config->get_ldap_link();
-       $ldap->cd($ldap->getParentDir($this->dn));
-       $ldap->search("cn=$this->cn");
-       $a= $ldap->fetch();
-       if (count($a)){
-               if (!isset($this->attrs["$type"."list"])){
-                       $this->attrs["$type"."list"]= array();
-               }
-               $ldap->cd($this->dn);
-               $ldap->modify($this->attrs);
-               $this->handle_post_events("modify");
-       } else {
-               $ldap->cd($this->config->current['BASE']);
-               $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
-               $ldap->cd($this->dn);
-               $ldap->add($this->attrs);
-               $this->handle_post_events("add");
-       }
-       show_ldap_error($ldap->get_error());
+    plugin::save();
+
+    /* Type selection */
+    if ($this->type == 0){
+      $type= "goFaxSBlock";
+    } else {
+      $type= "goFaxRBlock";
+    }
+
+    /* Add list */
+    $this->attrs['objectClass']= $type;
+    if (count($this->goFaxBlocklist)){
+      $this->attrs["$type"."list"]= $this->goFaxBlocklist;
+    }
+
+    /* Write back to ldap */
+    $ldap= $this->config->get_ldap_link();
+    $ldap->cd($ldap->getParentDir($this->dn));
+    $ldap->search("cn=$this->cn");
+    $a= $ldap->fetch();
+    if (count($a)){
+      if (!isset($this->attrs["$type"."list"])){
+        $this->attrs["$type"."list"]= array();
+      }
+      $ldap->cd($this->dn);
+      $ldap->modify($this->attrs);
+      $this->handle_post_events("modify");
+    } else {
+      $ldap->cd($this->config->current['BASE']);
+      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
+      $ldap->cd($this->dn);
+      $ldap->add($this->attrs);
+      $this->handle_post_events("add");
+    }
+    show_ldap_error($ldap->get_error());
   }
 
 
   function addNumber($number)
   {
-       if (!in_array($number, $this->goFaxBlocklist)){
-               $this->goFaxBlocklist[]= $number;
-               sort($this->goFaxBlocklist);
-       }
+    if (!in_array($number, $this->goFaxBlocklist)){
+      $this->goFaxBlocklist[]= $number;
+      sort($this->goFaxBlocklist);
+    }
   }
 
   function delNumber($numbers)
   {
-       $tmp= array();
-       foreach ($this->goFaxBlocklist as $val){
-               if (!in_array($val, $numbers)){
-                       $tmp[]= $val;
-               }
-       }
-       $this->goFaxBlocklist= $tmp;
+    $tmp= array();
+    foreach ($this->goFaxBlocklist as $val){
+      if (!in_array($val, $numbers)){
+        $tmp[]= $val;
+      }
+    }
+    $this->goFaxBlocklist= $tmp;
   }
 
   function remove_lock()
   {
-       if (isset($this->dn)){
-               del_lock ($this->dn);
-       }
+    if (isset($this->dn)){
+      del_lock ($this->dn);
+    }
   }
 
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>