diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 623d7f3bb90ec66bcea75c9efc871b4c3c6ef9ad..fbc3ab56b9cf4df74d5b90d7de1b40ffb2cf73f6 100644 (file)
}
/* Use template if there are any of them */
}
/* Use template if there are any of them */
- if ((count($this->templates) && !isset($_POST['new_template']))||($s_action=="create_user_from_tpl")){
+
+ 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);
}
foreach(array("sn", "givenName", "uid", "got_uid", "templates") as $attr){
$smarty->assign("$attr", $this->$attr);
}
/* NEW LIST MANAGMENT */
$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
/* NEW LIST MANAGMENT */
$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
- " <input type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ".
- " <input type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ".
- " <input type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'> ".
- " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
- " <input type='image' align='middle' src='images/list_new_user.png' title='"._("Create new user")."' alt='"._("New user")."' name='user_new'> ".
- " <input type='image' align='middle' src='images/list_new.png' title='"._("Create new template")."' alt='"._("New template")."' name='user_tplnew'> ".
- " <img src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
+ " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ".
+ " <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."' name='dep_root' alt='"._("Root")."'> ".
+ " <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."' alt='"._("Home")."' name='dep_home'> ".
+ " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
+ " <input class='center' type='image' align='middle' src='images/list_new_user.png' title='"._("Create new user")."' alt='"._("New user")."' name='user_new'> ".
+ " <input class='center' type='image' align='middle' src='images/list_new.png' title='"._("Create new template")."' alt='"._("New template")."' name='user_tplnew'> ".
+ " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
_("Current base")." <select name='depselect' onChange='mainform.submit()'>$options</select>".
_("Current base")." <select name='depselect' onChange='mainform.submit()'>$options</select>".
- " <input type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
+ " <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
"</div>";
$action= "<input type='image' src='images/edit.png' alt='"._("edit")."' name='user_edit_%KEY%' title='"._("Edit user")."'>";
"</div>";
$action= "<input type='image' src='images/edit.png' alt='"._("edit")."' name='user_edit_%KEY%' title='"._("Edit user")."'>";
* We also need to search for the departments
* So we are able to navigate like in konquerer
*/
* We also need to search for the departments
* So we are able to navigate like in konquerer
*/
+
+ /* Create base to search in */
$base2 = preg_replace("/ou=people,/i","",$base);
$base2 = preg_replace("/ou=people,/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();
$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;
}
$tmp = array();
foreach ($res3 as $value){
$tmp[strtolower($value['dn']).$value['dn']]=$value;
}
+
+ /* Sort array */
ksort($tmp);
ksort($tmp);
+
+ /* Create result array */
foreach($tmp as $value){
foreach($tmp as $value){
- if($value["description"][0]!=".."){
+ 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'])." - [".$value["description"][0]."]";
}else{
- $this->departments[$value['dn']]=$value["description"][0];
+ $this->departments[$value['dn']]=convert_department_dn2($value['dn']);
}
}
/* END NEW LIST MANAGMENT
}
}
/* END NEW LIST MANAGMENT