Removed dependencies for pureftpd schema

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@749 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 03db64be04be211085bf4c0cac82322657f35657..3dfc051e60fc6b04a8d3f176ac2d1a98871c562d 100644 (file)
--- 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";
@@ -537,7 +535,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]);
@@ -576,7 +574,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)";
@@ -590,9 +588,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)";
     }

diff --git a/plugins/admin/users/headpage.tpl b/plugins/admin/users/headpage.tpl
index 6f5804f0f7a20b8ed7412526d23959f6dfc73644..65282871b96f58bcf8b55de2e8bc620df067e032 100644 (file)
--- a/plugins/admin/users/headpage.tpl
+++ b/plugins/admin/users/headpage.tpl
@@ -51,8 +51,6 @@
                                <input type=checkbox name="mailusers" value="1" {$mailusers} onClick="mainform.submit()" title="{t}Select to see users that have mail settings{/t}">{t}Show mail users{/t}<br>
                                <input type=checkbox name="sambausers" value="1" {$sambausers} onClick="mainform.submit()" title="{t}Select to see users that have samba settings{/t}">{t}Show samba users{/t}<br>
                                <input type=checkbox name="proxyusers" value="1" {$proxyusers} onClick="mainform.submit()" title="{t}Select to see users that have proxy settings{/t}">{t}Show proxy users{/t}<br>
-                               <input type=checkbox name="ftpusers" value="1" {$ftpusers} onClick="mainform.submit()" title="{t}Select to see users that have ftp settings{/t}">{t}Show FTP users{/t}<br>
-                               <input type=checkbox name="faxusers" value="1" {$faxusers} onClick="mainform.submit()" title="{t}Select to see users that have FAX settings{/t}">{t}Show FAX users{/t}<br>
 
             </td>
         </tr>