diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index b5f7b2c55d88fea75cc023a41bcbf8e3a72d0f3f..a2a65bcf6fac5ad0850461a420f13b5bfc5dcaaf 100644 (file)
"subsearch" => "",
"proxyusers" => "checked",
"sambausers" => "checked",
"subsearch" => "",
"proxyusers" => "checked",
"sambausers" => "checked",
- "ftpusers" => "checked",
"faxusers" => "checked",
"functionalusers" => "checked",
"depselect" => $base,
"faxusers" => "checked",
"functionalusers" => "checked",
"depselect" => $base,
}
if (isset($_POST['depselect'])){
foreach( array("functionalusers", "unixusers", "mailusers",
}
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";
if (isset($_POST[$type])) {
$userfilter[$type]= "checked";
/* Reset requested? */
if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
/* 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= "";
$this->usertab= NULL;
$this->lognames= array();;
$this->sn= "";
}
if (isset($_POST['template'])){
$smarty->assign("template", $_POST['template']);
}
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)));
}
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
}
$this->uid= current($uids);
}
} else {
$this->uid= current($uids);
}
} else {
+ $smarty->assign("edit_uid", "");
$this->uid= "";
}
$this->got_uid= true;
$this->uid= "";
}
$this->got_uid= true;
$smarty->assign("launchimage", get_template_path('images/launch.png'));
$smarty->assign("deplist", $this->config->idepartments);
foreach( array("depselect", "regex", "functionalusers", "unixusers",
$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]);
"faxusers", "templates", "subsearch") as $type){
$smarty->assign("$type", $userfilter[$type]);
$filter="";
if ($userfilter['functionalusers'] == "checked"){
$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)";
}
if ($userfilter['unixusers'] == "checked"){
$filter.= "(objectClass=posixAccount)";
if ($userfilter['proxyusers'] == "checked"){
$filter.= "(objectClass=gosaProxyAccount)";
}
if ($userfilter['proxyusers'] == "checked"){
$filter.= "(objectClass=gosaProxyAccount)";
}
- if ($userfilter['ftpusers'] == "checked"){
- $filter.= "(objectClass=PureFTPdUser)";
- }
if ($userfilter['faxusers'] == "checked"){
$filter.= "(objectClass=goFaxAccount)";
}
if ($userfilter['faxusers'] == "checked"){
$filter.= "(objectClass=goFaxAccount)";
}