X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=fbc3ab56b9cf4df74d5b90d7de1b40ffb2cf73f6;hb=abc8a9b8c6eb1bac83a968b1525541c0f439d77f;hp=3035d85141db10113f731c651b45193f8c1ec457;hpb=614ea31e390c14ecb87206d319b01c23cfadbc51;p=gosa.git diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 3035d8514..fbc3ab56b 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -521,7 +521,8 @@ class userManagement extends plugin } /* 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); } @@ -666,15 +667,15 @@ class userManagement extends plugin /* NEW LIST MANAGMENT */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; $action= ""; @@ -685,10 +686,10 @@ class userManagement extends plugin $divlist = new divlist("userstab"); $divlist->SetHeader(array( - array("string" => " "), - array("string" => _("Username")." / "._("Department")), - array("string" => _("Properties")), - array("string" => _("Actions"), "attach" => "style='border:none'" ))); + array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), + array("string" => _("Username")." / "._("Department"), "attach" => "style=''"), + array("string" => _("Properties"), "attach" => "style='width:152px;'"), + array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'"))); $divlist->SetSummary(_("This table displays all users, in the selected tree.")); @@ -712,10 +713,10 @@ class userManagement extends plugin } } - $field1 = array("string" => "department","attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val)); - $field3 = array("string" => " "); - $field4 = array("string" => " ", "attach" => "style='width:48px;border:none'"); + $field1 = array("string" => "department", "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''"); + $field3 = array("string" => " ", "attach" => "style='width:152px;'"); + $field4 = array("string" => " ", "attach" => "style='width:60px;border-right:0px;text-align:right;'"); $divlist->AddEntry(array($field1,$field2,$field3,$field4)); @@ -768,10 +769,14 @@ class userManagement extends plugin /* If you want to disable the status pictures, just comment out the next line */ - $r_con= @mysql_pconnect($a_SETUP['SERVER'],$a_SETUP['LOGIN'],$a_SETUP['PASSWORD']); - // Check if we are connected correctly - if($r_con){ - $r_db = @mysql_select_db($a_SETUP['DB'],$r_con); + $r_con = false; + $r_db = false; + if(is_callable("mysql_pconnect")){ + $r_con= @mysql_pconnect($a_SETUP['SERVER'],$a_SETUP['LOGIN'],$a_SETUP['PASSWORD']); + // Check if we are connected correctly + if($r_con){ + $r_db = @mysql_select_db($a_SETUP['DB'],$r_con); + } } } @@ -787,7 +792,7 @@ class userManagement extends plugin $fonac = preg_replace("/%title%/", "", $fonac); /* Database connection is ok ?*/ - if($r_db){ + if(($r_db)&&(is_callable("mysql_query"))){ $res= @mysql_query("SELECT regseconds,name,port,ipaddr FROM ".$a_SETUP['SIP_TABLE']." WHERE (name='".$val['uid'][0]."')"); $mysql_entry = @mysql_fetch_row($res); if(is_array($mysql_entry)){ @@ -861,10 +866,10 @@ class userManagement extends plugin } /* Create each field */ - $field1 = array("string" => sprintf($tpl,$val['dn']),"attach"=>"style='width:20px;text-align:center;'"); - $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port,"attach"=>"title='".$val['dn']."'"); - $field3 = array("string" => $usrimg2." ".$posix." ".$enviro." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$s_img_create_from_template, "attach" => "style='width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none;text-align:right;width:48px'"); + $field1 = array("string" => sprintf($tpl,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display).$ip_port, "attach" => "style='' title='".$val['dn']."'"); + $field3 = array("string" => $usrimg2." ".$posix." ".$enviro." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$s_img_create_from_template, "attach" => "style='width:152px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='width:60px;border-right:0px;text-align:right;'"); $add = array($field1,$field2,$field3,$field4); @@ -913,7 +918,9 @@ class userManagement extends plugin $smarty->assign("alphabet", generate_alphabet()); $smarty->assign("hint", print_sizelimit_warning()); - @mysql_close($r_con); + if((is_callable("mysql_close"))&&($r_con)){ + @mysql_close($r_con); + } return ($smarty->fetch(get_template_path('headpage.tpl', TRUE))); } @@ -982,23 +989,31 @@ class userManagement extends plugin * 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); + /* 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(); + /* Create array with results */ $tmp = array(); foreach ($res3 as $value){ $tmp[strtolower($value['dn']).$value['dn']]=$value; } + + /* Sort array */ ksort($tmp); + + /* Create result array */ 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']]=$value["description"][0]; + $this->departments[$value['dn']]=convert_department_dn2($value['dn']); } } /* END NEW LIST MANAGMENT