From aac00d1feb7115f6f252e2dcfaa4b57a4441643e Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 17 Jun 2005 15:40:11 +0000 Subject: [PATCH] Removed dependencies for pureftpd schema git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@749 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/users/class_userManagement.inc | 11 +++-------- plugins/admin/users/headpage.tpl | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 03db64be0..3dfc051e6 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"; @@ -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 6f5804f0f..65282871b 100644 --- a/plugins/admin/users/headpage.tpl +++ b/plugins/admin/users/headpage.tpl @@ -51,8 +51,6 @@ {t}Show mail users{/t}
{t}Show samba users{/t}
{t}Show proxy users{/t}
- {t}Show FTP users{/t}
- {t}Show FAX users{/t}
-- 2.30.2