X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=a2a65bcf6fac5ad0850461a420f13b5bfc5dcaaf;hb=80ddd3991dd84b50ff87a05f26eae3b6e32a52a2;hp=b5f7b2c55d88fea75cc023a41bcbf8e3a72d0f3f;hpb=e299f0ca47a924516f2afbe4e922f2418b75315c;p=gosa.git

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index b5f7b2c55..a2a65bcf6 100644
--- a/plugins/admin/users/class_userManagement.inc
+++ b/plugins/admin/users/class_userManagement.inc
@@ -48,7 +48,6 @@ class userManagement extends plugin
           "subsearch"       => "",
           "proxyusers"      => "checked",
           "sambausers"      => "checked",
-          "ftpusers"        => "checked",
           "faxusers"        => "checked",
           "functionalusers" => "checked",
           "depselect"       => $base,
@@ -71,8 +70,7 @@ class userManagement extends plugin
       }
       if (isset($_POST['depselect'])){
         foreach( array("functionalusers", "unixusers", "mailusers",
-              "sambausers", "proxyusers", "ftpusers",
-              "faxusers", "templates", "subsearch") as $type){
+              "sambausers", "proxyusers", "faxusers", "templates", "subsearch") as $type){
 
           if (isset($_POST[$type])) {
             $userfilter[$type]= "checked";
@@ -124,8 +122,10 @@ class userManagement extends plugin
 
     /* Reset requested? */
     if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
-      del_lock ($this->usertab->dn);
-      unset ($this->usertab);
+      if (isset($this->usertab)){
+        del_lock ($this->usertab->dn);
+        unset ($this->usertab);
+      }
       $this->usertab= NULL;
       $this->lognames= array();;
       $this->sn= "";
@@ -405,7 +405,10 @@ class userManagement extends plugin
         }
         if (isset($_POST['template'])){
           $smarty->assign("template", $_POST['template']);
+        } else {
+          $smarty->assign("template", "");
         }
+        $smarty->assign("edit_uid", "");
         return($smarty->fetch(get_template_path('template.tpl', TRUE)));
       }
 
@@ -448,6 +451,7 @@ class userManagement extends plugin
             $this->uid= current($uids);
           }
         } else {
+            $smarty->assign("edit_uid", "");
           $this->uid= "";
         }
         $this->got_uid= true;
@@ -533,7 +537,7 @@ class userManagement extends plugin
     $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",
+          "mailusers", "sambausers", "proxyusers", 
           "faxusers", "templates", "subsearch") as $type){
 
       $smarty->assign("$type", $userfilter[$type]);
@@ -572,7 +576,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)";
@@ -586,9 +590,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)";
     }