Code

Fixed foreach error
[gosa.git] / plugins / admin / users / class_userManagement.inc
index 50009650714d8e5935f91e27039fe4f8669e1bb3..88936bd503a44fca137274790f3a877074bdd5c7 100644 (file)
@@ -32,6 +32,7 @@ class userManagement extends plugin
   var $acl= "";
   var $templates= array();
   var $got_uid= false;
+  var $departments=array();
 
   function userManagement ($config, $ui)
   {
@@ -40,7 +41,7 @@ class userManagement extends plugin
     $this->ui= $ui;
 
     /* Get global filter config */
-    if (!is_global("userfilter")){
+    if (!isset($_SESSION["userfilter"])){
       $base= get_base_from_people($ui->dn);
       $userfilter= array( "mailusers"       => "checked",
           "unixusers"       => "checked",
@@ -48,57 +49,140 @@ class userManagement extends plugin
           "subsearch"       => "",
           "proxyusers"      => "checked",
           "sambausers"      => "checked",
-          "ftpusers"        => "checked",
           "faxusers"        => "checked",
           "functionalusers" => "checked",
           "depselect"       => $base,
           "regex"           => "*");
-      register_global("userfilter", $userfilter);
+      $_SESSION["userfilter"] = $userfilter;
     }
   }
 
   function execute()
   {
-    $smarty= get_smarty();
-    $userfilter= get_global("userfilter");
+       /* Call parent execute */
+       plugin::execute();
+
+    $smarty       = get_smarty();             // Smarty instance
+    $userfilter   = get_global("userfilter"); // 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']);
+      $userfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+    }
+
+    /* 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";
+      }elseif(preg_match("/userfrom_tpl.*/i",$key)){
+        $s_action="create_user_from_tpl";
+        $s_entry  = preg_replace("/userfrom_tpl_/i","",$key);
+      }
+    }
+
+    if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){
+      $s_action = "edit";
+      $s_entry  = $_GET['id'];
+    }
+
+    $s_entry  = preg_replace("/_.$/","",$s_entry);
+
+    if(preg_match("/.*-.*/",$s_entry)){
+      $s_tab   = preg_replace("/^.*-/i","",$s_entry);
+      $s_entry = preg_replace("/-.*$/i","",$s_entry);
+    }else{
+      $s_tab   = "user";
+    };
+
+    /* Department changed? */
+    if(isset($_POST['depselect']) && $_POST['depselect']){
+      $userfilter['depselect']= $_POST['depselect'];
+    }
+
+    /* Homebutton is posted */
+    if($s_action=="home"){
+      $userfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
+      $userfilter['depselect']=(preg_replace("/^[^,]+,/","",$userfilter['depselect']));
+    }
+
+    if($s_action=="root"){
+      $userfilter['depselect']=($this->config->current['BASE']);
+    }
+
+
+    /* If Backbutton is Posted */
+    if($s_action=="back"){
+      $base_back          = preg_replace("/^[^,]+,/","",$userfilter['depselect']);
+      $base_back          = convert_department_dn($base_back);
+
+      if(isset($this->config->departments[trim($base_back)])){
+        $userfilter['depselect']= $this->config->departments[trim($base_back)];
+      }else{
+        $userfilter['depselect']= $this->config->departments["/"];
+      }
+    }
+
+    /* End for new List Managment */
 
     /* Save filter data if we are in the headpage */
     if (!isset($this->usertab)){
-      foreach( array("depselect", "regex") as $type){
-        if (isset($_POST[$type])){
-          $userfilter[$type]= $_POST[$type];
-        }
+      if (isset($_POST['regexit'])){
+        $userfilter["regex"]= $_POST['regexit'];
       }
-      if (isset($_POST['depselect'])){
-        foreach( array("functionalusers", "unixusers", "mailusers",
-              "sambausers", "proxyusers", "ftpusers",
-              "faxusers", "templates", "subsearch") as $type){
-
-          if (isset($_POST[$type])) {
-            $userfilter[$type]= "checked";
-          } else {
-            $userfilter[$type]= "";
-          }
+    }
+    if(isset($_POST['regexit'])){
+      foreach( array("functionalusers", "unixusers", "mailusers","sambausers", "proxyusers", "faxusers", "templates", "subsearch") as $type){
+        if (isset($_POST[$type])) {
+          $userfilter[$type]= "checked";
+        } else {
+          $userfilter[$type]= "";
         }
       }
-      if (isset($_GET['search'])){
-        $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
-        if ($s == "**"){
-          $s= "*";
-        }
-        $userfilter['regex']= $s;
+    }
+    if (isset($_GET['search'])){
+      $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
+      if ($s == "**"){
+        $s= "*";
       }
-      register_global("userfilter", $userfilter);
+      $userfilter['regex']= $s;
     }
+    register_global("userfilter", $userfilter);
+
 
     /* React on user interaction here */
-    if ($_SERVER["REQUEST_METHOD"] == "POST"){
+    if (($_SERVER["REQUEST_METHOD"] == "POST")||($_SERVER["REQUEST_METHOD"]== "GET")){
 
       /* User wants to edit data? */
-      if ( (isset($_POST['select_user']) || (isset($_POST['edit_helper']) && $_POST['edit_helper'] == "1")) && isset($_POST['userlist']) && $_POST['userlist'] != ""){
+      if ($s_action=="edit"){
 
         /* Get 'dn' from posted 'uid', must be unique */
-        $this->dn= trim($_POST['userlist']);
+
+        $this->dn= $this->list[trim($s_entry)]['dn'];
 
         /* Check locking, save current plugin in 'back_plugin', so
            the dialog knows where to return. */
@@ -116,6 +200,10 @@ class userManagement extends plugin
         /* Register usertab to trigger edit dialog */
         $this->usertab= new usertabs($this->config, 
             $this->config->data['TABS']['USERTABS'], $this->dn);
+        //        $_POST[$s_tab]=$s_tab;
+
+        // This would be better
+        $this->usertab->current = $s_tab;
         $this->usertab->set_acl($acl);
 
         $_SESSION['objectinfo']= $this->dn;
@@ -137,10 +225,10 @@ class userManagement extends plugin
     }
 
     /* Password change requested */
-    if (isset($_POST['setpass_user']) && isset($_POST['userlist'])){
+    if ($s_action=="change_pw"){
 
       /* Get 'dn' from posted 'uid' */
-      $this->dn= trim($_POST['userlist']);
+      $this->dn= $this->list[trim($s_entry)]['dn'];
 
       /* Load permissions for selected 'dn' and check if
          we're allowed to remove this 'dn' */
@@ -190,18 +278,37 @@ class userManagement extends plugin
           return($smarty->fetch(get_template_path('password.tpl', TRUE)));
         }
 
+        $config= $this->config;
+        $ldap_ui= $this->config->get_ldap_link();
+        if(isset($this->usertab->dn)){
+          $user = ($ldap_ui->fetch($ldap_ui->cat($this->usertab->dn)));
+        }else{
+          $user = ($ldap_ui->fetch($ldap_ui->cat($this->dn)));
+        }
+        if((is_array($user))&&(isset($user['uid']))){
+          $username= $user['uid'][0];
+        }
+
         /* Set password, perform required steps */
         if ($this->usertab){
           if ($this->usertab->password_change_needed()){
             $obj= $this->usertab->by_object['user'];
             change_password ($this->usertab->dn, $_POST['new_password'],
                 0, $obj->pw_storage);
+            if (isset($config->data['MAIN']['EXTERNALPWDHOOK'])){
+              exec($config->data['MAIN']['EXTERNALPWDHOOK']." ".$username." ".$_POST['new_password'], $resarr);
+            }
+
             gosa_log ("Password for '".$this->usertab->dn."' has been changed");
             unset($this->usertab);
             $this->usertab= NULL;
           }
         } else {
           change_password ($this->dn, $_POST['new_password']);
+          if (isset($config->data['MAIN']['EXTERNALPWDHOOK'])){
+            exec($config->data['MAIN']['EXTERNALPWDHOOK']." ".$username." ".$_POST['new_password'], $resarr);
+          }
+
           gosa_log ("Password for '".$this->dn."' has been changed");
         }
       } else {
@@ -224,10 +331,10 @@ class userManagement extends plugin
 
 
     /* Remove user was requested */
-    if (isset($_POST['delete_user']) && isset($_POST['userlist'])){
+    if ($s_action=="del"){
 
       /* Get 'dn' from posted 'uid' */
-      $this->dn= trim($_POST['userlist']);
+      $this->dn= $this->list[trim($s_entry)]['dn'];
 
       /* Load permissions for selected 'dn' and check if
          we're allowed to remove this 'dn' */
@@ -243,7 +350,7 @@ class userManagement extends plugin
 
         /* Lock the current entry, so nobody will edit it during deletion */
         add_lock ($this->dn, $this->ui->dn);
-        $smarty->assign("info", sprintf(_("You're about to delete the user %s."), $this->dn));
+        $smarty->assign("info", sprintf(_("You're about to delete the user %s."), LDAP::fix($this->dn)));
         return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
       } else {
 
@@ -352,16 +459,27 @@ class userManagement extends plugin
     }
 
     /* Generate template list */
-    if (isset($_POST['new_user'])){
+    if (($s_action=="new")||($s_action=="create_user_from_tpl")){
+
       $this->templates= array();
+
       $ldap= $this->config->get_ldap_link();
+
+      /* Create list of tempaltes */
       foreach ($this->config->departments as $key => $value){
+    
+        /* Get acls from different ou's */
         $acl= get_permissions (get_people_ou().$value, $this->ui->subtreeACL);
         $acl= get_module_permission($acl, "user", get_people_ou().$value);
+  
+        /* If creation of a new user is allowed, append this template */
         if (chkacl($acl, "create") == ""){
+          
+          /* Search all templates from the current dn */
           $ldap->cd (get_people_ou().$value);
           $ldap->search ("(objectClass=gosaUserTemplate)", array("uid"));
 
+          /* Append */
           if ($ldap->count() != 0){
             while ($attrs= $ldap->fetch()){
               $this->templates[$ldap->getDN()]=
@@ -371,13 +489,14 @@ class userManagement extends plugin
           }
         }
       }
+
+      /* Sort templates */
       natcasesort ($this->templates);
       reset ($this->templates);
     }
 
     /* New user/template request */
-    if (isset($_POST['new_user']) || isset($_POST['new_template'])){
-
+    if (($s_action=="create_user_from_tpl")||($s_action=="new") || ($s_action=="new_tpl")){
       /* By default we set 'dn' to 'new', all relevant plugins will
          react on this. */
       $this->dn= "new";
@@ -391,9 +510,10 @@ class userManagement extends plugin
       $this->usertab= new usertabs($this->config,
           $this->config->data['TABS']['USERTABS'], $this->dn);
       $this->usertab->set_acl(array(':all'));
+      $this->usertab->by_object['user']->base= $userfilter['depselect'];
 
       /* Take care about templates */
-      if (isset($_POST['new_template'])){
+      if ($s_action=="new_tpl"){
         $this->is_template= TRUE;
         $this->usertab->set_template_mode ();
       } else {
@@ -401,20 +521,23 @@ class userManagement extends plugin
       }
 
       /* Use template if there are any of them */
-      if (count($this->templates) && !isset($_POST['new_template'])){
+  
+      if ((count($this->templates) && ($s_action!='new_tpl'))||($s_action=="create_user_from_tpl")){
         foreach(array("sn", "givenName", "uid", "got_uid", "templates") as $attr){
           $smarty->assign("$attr", $this->$attr);
         }
-        if (isset($_POST['template'])){
-          $smarty->assign("template", $_POST['template']);
+        if ($s_action=="create_user_from_tpl"){
+          $smarty->assign("template", $this->dn= $this->list[trim($s_entry)]['dn']);
+        } else {
+          $smarty->assign("template", "none");
         }
+        $smarty->assign("edit_uid", "");
         return($smarty->fetch(get_template_path('template.tpl', TRUE)));
       }
-
     }
 
     /* Continue template editing */
-    if (isset($_POST['template_continue']) && $_POST['template'] != 'none' && !isset($_POST['uid'])){
+    if ((isset($_POST['template_continue']) && $_POST['template'] != 'none' && !isset($_POST['uid']))){
       $this->sn= $_POST['sn'];
       $this->givenName= $_POST['givenName'];
 
@@ -450,6 +573,7 @@ class userManagement extends plugin
             $this->uid= current($uids);
           }
         } else {
+          $smarty->assign("edit_uid", "");
           $this->uid= "";
         }
         $this->got_uid= true;
@@ -477,23 +601,27 @@ class userManagement extends plugin
     if (isset($_POST['template_continue']) && $_POST['template'] != 'none' && (isset($_POST['uid']))){
 
       /* Might not be filled if IDGEN is unset */
-      $this->sn= $_POST['sn'];
-      $this->givenName= $_POST['givenName'];
+      $this->sn                 = $_POST['sn'];
+      $this->givenName          = $_POST['givenName'];
 
       /* Move user supplied data to sub plugins */
-      $this->uid= $_POST['uid'];
-      $this->usertab->uid= $this->uid;
-      $this->usertab->sn= $this->sn;
-      $this->usertab->givenName= $this->givenName;
-      $template_dn= $_POST['template'];
+      $this->uid                = $_POST['uid'];
+      $this->usertab->uid       = $this->uid;
+      $this->usertab->sn        = $this->sn;
+      $this->usertab->givenName = $this->givenName;
+      $template_dn              = $_POST['template'];
       $this->usertab->adapt_from_template($template_dn);
-      $template_base= preg_replace("/^[^,]+,".get_people_ou()."/", '', $template_dn);
+      $template_base            = preg_replace("/^[^,]+,".get_people_ou()."/", '', $template_dn);
       $this->usertab->by_object['user']->base= $template_base;
 
       /* Set up the users ACL's for this 'dn' */
       $acl= get_permissions ($template_base, $this->ui->subtreeACL);
       $this->usertab->set_acl($acl);
     }
+    
+    if (isset($_POST['template_continue']) && ($_POST['template'] == 'none')){
+      $this->usertab->by_object['user']->base= $userfilter['depselect'];
+    }
 
     /* Show tab dialog if object is present */
     if ($this->usertab){
@@ -527,25 +655,272 @@ class userManagement extends plugin
       return($message);
     }
 
+    /* Prepare departments */
+    $options= "";
+    foreach ($this->config->idepartments as $key => $value){
+      if ($userfilter['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 class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'>&nbsp;".
+      " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'>&nbsp;".
+      " <img   class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_new_user.png' title='"._("Create new user")."' alt='"._("New user")."' name='user_new'>&nbsp;".
+      " <input class='center' type='image' align='middle' src='images/list_new.png' title='"._("Create new template")."' alt='"._("New template")."' name='user_tplnew'>&nbsp;".
+      " <img   class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'>&nbsp;".
+      _("Base")."&nbsp;<select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
+      " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;".
+      "</div>";
+
+    $action= "<input class='center' type='image' src='images/edit.png' alt='"._("edit")."'     name='user_edit_%KEY%' title='"._("Edit user")."'>";
+    $action.= "<input class='center' type='image' src='images/list_password.png' alt='"._("password")."' name='user_chgpw_%KEY%' title='"._("Change password")."'>";
+    $action.= "<input class='center' type='image' src='images/edittrash.png' alt='"._("delete")."'   name='user_del_%KEY%' title='"._("Delete user")."'>";
+
+
+
+    $divlist = new divlist("userstab");
+    $divlist->SetHeader(array(
+          array("string" => "&nbsp;", "attach" => "style='text-align:center;width:20px;'"),
+          array("string" => _("Username")." / "._("Department"), "attach" => "style=''"),
+          array("string" => _("Properties"), "attach" => "style='width:152px;'"),
+          array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'")));
+
+
+    $divlist->SetSummary(_("This table displays all users, in the selected tree."));
+    $divlist->SetEntriesPerPage(0);
+
+    // Defining Links 
+    $linkopen = "<a href='?plug=".$_GET['plug']."&amp;act=dep_open&amp;dep_id=%s'>%s</a>";
+
+    /* Insert departments in divlist*/
+    foreach($this->departments as $key=> $val){
+
+      if(!isset($this->config->departments[trim($key)])){
+        $this->config->departments[trim($key)]="";
+      }
+
+      $non_empty="";
+      $keys= str_replace("/","\/",$key);
+      foreach($this->config->departments as $keyd=>$vald ){
+        if(preg_match("/".$keys."\/.*/",$keyd)){
+          $non_empty="full";
+        }
+      }
+
+      $field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='department'>", "attach" => "style='text-align:center;width:20px;'");
+      $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
+      $field3 = array("string" => "&nbsp;", "attach" => "style='width:152px;'");
+      $field4 = array("string" => "&nbsp;", "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+
+
+      $divlist->AddEntry(array($field1,$field2,$field3,$field4));
+    }
+
+    /* Pictures for Extensions */
+    $usrimg   ="<input class='center' type='image' src='images/penguin.png' alt='"._("GOsa")."'   
+                    name='user_edit_%KEY%-user' title='"._("Edit generic properties")."'>";
+    $posiximg = "<input class='center' type='image' src='images/select_user.png' alt='"._("Posix")."'  
+                    name='user_edit_%KEY%-posixAccount' title='"._("Edit UNIX properties")."'>";
+    $eviroimg = "<input class='center' type='image' src='images/smallenv.png' alt='"._("Environment")."'  
+                    name='user_edit_%KEY%-environment' title='"._("Edit environment properties")."'>";
+    $mailimg  = "<input class='center' type='image' src='images/mailto.png' alt='"._("Mail")."'     
+                    name='user_edit_%KEY%-mailAccount' title='"._("Edit mail properties")."'>";
+    $fonimg   = "<input class='center' type='image' src='images/%image%' alt='"._("Phone")."'     
+                    name='user_edit_%KEY%-phoneAccount' title='"._("Edit phone properties")."%title%'>";
+    $faximg   = "<input class='center' type='image' src='images/fax_small.png' alt='"._("Fax")."'     
+                    name='user_edit_%KEY%-gofaxAccount' title='"._("Edit fax properies")."'>";
+    $sambaimg = "<input class='center' type='image' src='images/select_winstation.png' alt='"._("Samba")."'     
+                    name='user_edit_%KEY%-sambaAccount' title='"._("Edit samba properties")."'>"; 
+    $tplcreateuserimg  = "<input type='image' class='center' src='images/list_new.png' alt='"._("Create user from template")."'
+                    name='userfrom_tpl_%KEY%' title='"._("Create user with this template")."'>";   
+    
+
+    $empty    = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>"; 
+
+    // User and Template  Images  
+    $userimg  = "<img class='center' src='images/select_user.png' alt='User' title='%s'>";   
+    $tplimg   = "<img class='center' src='images/select_template.png' alt='Template' title='%s'>";   
+    $editlink = "<a href='?plug=".$_GET['plug']."&amp;id=%s&amp;act=edit_entry'>%s</a>";
+
+    // Defines Arrays to save User and Templates
+    $tpls = array();
+    $users= array();
+
+    /* Get Configuration for goFon DB (if it is set), to connect to the asterisk tables.
+     * Read Sip Table for specified account (for each user with phoneAccount).
+     * Check the attributes ip port and regseconds.
+     * If regseconds is set and >0 , the phone is logged in.
+     * Else the phone is currently not logged.
+     * If we can't read any Data from the DB or there is no goFon DB specified
+     * show old style without status icons.
+     */
+    $r_db   =false;
+    $r_con  =false;
+    if (isset($_SESSION['config']->data['SERVERS']['FON'])){
+      $a_SETUP= $_SESSION['config']->data['SERVERS']['FON'];
+      // Connect to DB server
+  
+      /* 
+        If you want to disable the status pictures, just comment out the next line
+      */
+      $r_con = false;
+      $r_db  = false;
+      if(is_callable("mysql_pconnect")){
+        $r_con= @mysql_pconnect($a_SETUP['SERVER'],$a_SETUP['LOGIN'],$a_SETUP['PASSWORD']);
+        // Check if we are  connected correctly
+        if($r_con){
+          $r_db  =  @mysql_select_db($a_SETUP['DB'],$r_con);
+        }
+      }
+    }
+
+    // Test Every Entry and generate divlist Array  
+    foreach($this->list as $key => $val){
+      $connected  = ""; // This string represents timestamp or offline status 
+      $ip_port    = ""; // String that will represent ip : port of the connected phone
+      if((in_array("goFonAccount"    ,$val['objectClass']))){
+  
+        /* Set defaults */
+        $fonac = preg_replace("/%image%/", "select_phone.png", $fonimg);
+        $fonac = preg_replace("/%KEY%/", "$key", $fonac);
+        $fonac = preg_replace("/%title%/", "", $fonac);
+
+        /* Database connection is ok ?*/
+        if(($r_db)&&(is_callable("mysql_query"))){
+          $res= @mysql_query("SELECT regseconds,name,port,ipaddr FROM ".$a_SETUP['SIP_TABLE']." WHERE (name='".$val['uid'][0]."')");
+          $mysql_entry = @mysql_fetch_row($res);
+          if(is_array($mysql_entry)){
+            if((isset($mysql_entry[0]))&&($mysql_entry[0]>1)){
+              $connected = " | "._("Online")." : ".gmdate("d.m.Y H:i:s",($mysql_entry[0]+(60*60)));
+              $fonac = preg_replace("/%image%/", "select_phone_connected.png", $fonimg);
+              $fonac = preg_replace("/%KEY%/", "$key", $fonac);
+              $fonac = preg_replace("/%title%/", $connected, $fonac);
+              $ip_port= " - ".$mysql_entry[3].":".$mysql_entry[2];
+            }
+            if((isset($mysql_entry[0]))&&($mysql_entry[0]==0)){
+              $connected = " | "._("Offline");
+              $fonac = preg_replace("/%image%/", "select_phone.png", $fonimg);
+              $fonac = preg_replace("/%KEY%/", "$key", $fonac);
+              $fonac = preg_replace("/%title%/", $connected, $fonac);
+            }
+          }
+        }
+      }else{
+        $fonac=$empty;
+      }
+
+    
+
+      // Specify Pics for Extensions  
+      if(in_array("posixAccount"    ,$val['objectClass'])){ 
+        $posix = preg_replace("/%KEY%/", "$key", $posiximg);
+      }else{ 
+        $posix=$empty;
+      }
+      
+      if(in_array("gotoEnvironment"    ,$val['objectClass'])){ 
+        $enviro = preg_replace("/%KEY%/", "$key", $eviroimg);
+      }else{ 
+        $enviro =$empty;
+      }
+   
+      if(in_array("gosaMailAccount" ,$val['objectClass'])){ 
+        $maila = preg_replace("/%KEY%/", "$key", $mailimg);   
+      }else{ 
+        $maila=$empty;
+      } 
+  
+      if(in_array("goFaxAccount"    ,$val['objectClass'])){ 
+        $faxac = preg_replace("/%KEY%/", "$key", $faximg);    
+      }else{ 
+        $faxac=$empty;
+      } 
+
+      if(in_array("sambaSamAccount" ,$val['objectClass'])){ 
+        $samba = preg_replace("/%KEY%/", "$key", $sambaimg);  
+      }else{ 
+        $samba=$empty;
+      } 
+
+      if(in_array("gosaUserTemplate",$val['objectClass'])){ 
+        $tpl                          = preg_replace("/%KEY%/", "$key", $tplimg);   
+        $s_img_create_from_template   = preg_replace("/%KEY%/", "$key", $tplcreateuserimg);
+      }else{ 
+        $s_img_create_from_template   = "";
+        $tpl=$userimg;
+      }
+
+      $usrimg2 = preg_replace("/%KEY%/", "$key", $usrimg);
+
+      // Generate caption for rows
+      if (isset($val["sn"]) && isset($val["givenName"])){
+        $display= $val["sn"][0].", ".$val["givenName"][0]." [".$val["uid"][0]."]";
+      } else {
+        $display= "[".$val["uid"][0]."]";
+      }
+
+      /* Create each field */
+      $field1 = array("string" => sprintf($tpl,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
+      $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".$val['dn']."'");
+      $field3 = array("string" => $usrimg2."&nbsp;".$posix."&nbsp;".$enviro."&nbsp;".$maila."&nbsp;".$fonac."&nbsp;".$faxac."&nbsp;".$samba."&nbsp;".$s_img_create_from_template, "attach" => "style='width:152px;'");
+      $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='width:60px;border-right:0px;text-align:right;'");
+
+      $add = array($field1,$field2,$field3,$field4);
+
+      // Template or User
+      if(in_array("gosaUserTemplate",$val['objectClass'])){
+        $tpls[strtolower( $val['sn']['0'].$val['uid']['0'])]=$add;
+      }else{
+        $users[strtolower( $val['sn']['0'].$val['uid']['0'])]=$add;
+      }
+    }
+
+    // Sort Entries 
+    ksort($users);
+    ksort($tpls);
+
+    // Append Templates
+    foreach($tpls as $key => $val){
+      $divlist->AddEntry( $val, array(""));
+    }
+    // Append Users 
+    foreach($users as $key => $val){
+      $divlist->AddEntry( $val, array(""));
+    }
     /* Show main page */
-    $smarty->assign("userlist", $this->userlist);
+    //$smarty->assign("userlist",   nl2br(htmlentities($divlist->DrawList())));
+    $smarty->assign("userlist",   $divlist->DrawList());
+    $smarty->assign("userlisthead", $listhead);
+
+    /* END NEW LIST MANAGMENT
+     */  
     $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("deplist", $this->config->idepartments);
-    foreach( array("depselect", "regex", "functionalusers", "unixusers",
-          "mailusers", "sambausers", "proxyusers", "ftpusers",
+    foreach( array("depselect",  "functionalusers", "unixusers",
+          "mailusers", "sambausers", "proxyusers", 
           "faxusers", "templates", "subsearch") as $type){
 
       $smarty->assign("$type", $userfilter[$type]);
     }
 
+    $smarty->assign("regex", $userfilter["regex"]);
     /* Extend if we are not using javascript */
     $smarty->assign("apply", apply_filter());
     $smarty->assign("alphabet", generate_alphabet());
     $smarty->assign("hint", print_sizelimit_warning());
 
+    if((is_callable("mysql_close"))&&($r_con)){
+      @mysql_close($r_con);
+    }
     return ($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
   }
 
@@ -574,7 +949,7 @@ class userManagement extends plugin
 
     $filter="";
     if ($userfilter['functionalusers'] == "checked"){
-      $filter.= "(&(objectClass=gosaAccount)(!(|(objectClass=posixAccount)(objectClass=gosaMailAccount)(objectClass=PureFTPdUser)(objectClass=$samba)(objectClass=goFaxAccount)(objectClass=gosaProxyAccount))))";
+      $filter.= "(&(objectClass=gosaAccount)(!(|(objectClass=posixAccount)(objectClass=gosaMailAccount)(objectClass=$samba)(objectClass=goFaxAccount)(objectClass=gosaProxyAccount))))";
     }
     if ($userfilter['unixusers'] == "checked"){
       $filter.= "(objectClass=posixAccount)";
@@ -588,9 +963,6 @@ class userManagement extends plugin
     if ($userfilter['proxyusers'] == "checked"){
       $filter.= "(objectClass=gosaProxyAccount)";
     }
-    if ($userfilter['ftpusers'] == "checked"){
-      $filter.= "(objectClass=PureFTPdUser)";
-    }
     if ($userfilter['faxusers'] == "checked"){
       $filter.= "(objectClass=goFaxAccount)";
     }
@@ -611,6 +983,49 @@ class userManagement extends plugin
       $this->list= get_list($this->ui->subtreeACL, "$filter", FALSE, $base, array("uid", "givenName", "sn", "objectClass"), TRUE);
     }
 
+
+
+    /* NEW LIST MANAGMENT
+     * We also need to search for the departments
+     * So we are able to navigate like in konquerer 
+     */
+
+    /* Create base to search in */
+
+    $peopleOU = get_people_ou();
+    if(empty($peopleOU))  {
+      $base2 = $base;
+    }else{
+      $base2 = preg_replace("/".$peopleOU."/i","",$base);
+    }
+
+    /* Get all departments within this subtree */
+    $res3 =  get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
+        TRUE, $base2, array("ou", "description"), TRUE);
+
+    $this->departments= array();
+
+    /* Create array with results */
+    $tmp = array();
+    foreach ($res3 as $value){
+      $tmp[strtolower($value['dn']).$value['dn']]=$value;
+    }
+
+    /* Sort array */
+    ksort($tmp);
+
+    /* Create result array */
+    foreach($tmp as $value){
+      if(isset($value['description'][0])){
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+      }else{
+        $this->departments[$value['dn']]=convert_department_dn2($value['dn']);
+      }
+    }
+    /* END NEW LIST MANAGMENT 
+     */
+
+
     $this->userlist= array();
 
     foreach ($this->list as $value){
@@ -628,6 +1043,7 @@ class userManagement extends plugin
         }
       }
     }
+
     natcasesort ($this->userlist);
     reset ($this->userlist);
   }