X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=08e47a82fcdb1cd5730357d2172e513abb0b300d;hb=e79b3cdfb979fd270d2fd1a53d2991f1ec4df5ec;hp=cc8b4c56567b366e729c06c27fbb14bb3c938cc5;hpb=7692f34a23250aa815f368cc9cd17064cf0af141;p=gosa.git
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index cc8b4c565..08e47a82f 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -77,7 +77,7 @@ class MultiSelectWindow{
}
/* Adds a regex input field to the current dialog */
- function AddRegex($name,$string,$value,$conn,$image="images/search.png")
+ function AddRegex($name,$string,$value,$conn,$image="images/lists/search.png")
{
$arr = array();
@@ -211,7 +211,7 @@ class MultiSelectWindow{
/* Return default header part. With back, home and root icons and department selection */
- function get_default_header()
+ function get_default_header($seperator= TRUE)
{
$enable_back = TRUE;
$enable_root = TRUE;
@@ -239,7 +239,7 @@ class MultiSelectWindow{
$listhead .= " ";
}else{
- $listhead .= "
";
+ $listhead .= "
";
}
/* Draw back button */
@@ -247,7 +247,7 @@ class MultiSelectWindow{
$listhead .= " ";
}else{
- $listhead .= "
";
+ $listhead .= "
";
}
/* Draw home button */
@@ -255,14 +255,15 @@ class MultiSelectWindow{
$listhead .= " ";
}else{
- $listhead .= "
";
+ $listhead .= "
";
}
/* And at least draw reload button, this button is enabled everytime */
$listhead .= " ".
- "
";
-
+ title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ";
+ if ($seperator){
+ $listhead.= "
";
+ }
return ($listhead);
}
@@ -402,9 +403,9 @@ class MultiSelectWindow{
/* Check if box is checked */
if($box['default'] == true){
- $boxes .=" ".$box['string']."
";
+ $boxes .=" ".$box['string']."
";
}else{
- $boxes .=" ".$box['string']."
";
+ $boxes .=" ".$box['string']."
";
}
}
$smarty->assign("CheckBoxes", $boxes);
@@ -422,7 +423,7 @@ class MultiSelectWindow{
+ value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\">
|
";
@@ -452,12 +453,12 @@ class MultiSelectWindow{
$smarty->assign("DivList" , $divlist->DrawList()."\n\n\n\n\n".$this->footer."\n\n\n\n\n");
if($this->is_headpage){
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info.png'));
$smarty->assign("launchimage", get_template_path('images/launch.png'));
$smarty->assign("apply", apply_filter());
}else{
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
+ $smarty->assign("tree_image", get_template_path('images/lists/search-subtree.png'));
$smarty->assign("infoimage", get_template_path('images/info_small.png'));
$smarty->assign("launchimage", get_template_path('images/rocket.png'));
$smarty->assign("apply", apply_filter());
@@ -524,11 +525,11 @@ class MultiSelectWindow{
/* Open selected department
this is posted by the parent class MultiSelectWindow */
if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
- $s_entry = base64_decode($_GET['dep_id']);
- if (!isset($this->config->departments[$s_entry])){
+ $s_entry = $_GET['dep_id'];
+ if (!isset($this->departments[$s_entry])){
msg_dialog::display(_("LDAP error"), sprintf(_("Inconsistent DN encoding detected: '%s'"), LDAP::fix($s_entry)), ERROR_DIALOG);
} else {
- $this->selectedBase = $this->config->departments[$s_entry];
+ $this->selectedBase = $this->departments[$s_entry]['dn'];
}
}
@@ -634,56 +635,6 @@ class MultiSelectWindow{
}
- /* Create header snapshot value */
- function get_snapshot_header($layer_menu = FALSE)
- {
- $str = "";
- if($this->parent->snapshotEnabled()){
- $ok = false;
- foreach($this->parent->get_used_snapshot_bases() as $base){
- $ok |= count($this->parent->getAllDeletedSnapshots($base)) >= 1 ;
- }
- if($ok){
- if($layer_menu){
- $str = "..|
"._("Restore")."|RestoreDeletedSnapShot|\n";
- }else{
- $str = " ";
- }
- }else{
- if($layer_menu){
- $str = "..|
"._("Restore")."||\n";
- }else{
- $str = "
";
- }
- }
-# $str .= "
";
- }
- return($str);
- }
-
-
- function GetSnapShotActions($dn)
- {
- $str= "";
- if($this->parent->snapshotEnabled()){
-
- if(count($this->parent->Available_SnapsShots($dn))){
- $str.= " ";
- } else {
- $str = "
";
- }
-
- $str.= " ";
- }
-
- return($str);
- }
-
-
/* this function adds the sub-departments of the current tree to the list */
function AddDepartments($base = false,$numtabs = 3,$empty_tabs_in_front = 0)
{
@@ -707,7 +658,7 @@ class MultiSelectWindow{
/* Get all departments within this subtree */
$deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
- array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
+ array("ou", "description"), GL_SIZELIMIT );
/* Edit delete link for system types
*/
@@ -716,50 +667,49 @@ class MultiSelectWindow{
/* Create an array with all visible (in the list) departments */
$departments = array();
foreach($deps as $value){
- if(isset($value['description'][0])){
- $this->departments[$value['dn']]= get_sub_department($value['dn'])." - [".$value["description"][0]."]";
- }else{
- $this->departments[$value['dn']]= get_sub_department($value['dn']);
- }
+ $name = $value['ou'][0]." -".$value['dn'];
+ $this->departments[$name]= $value;
}
- natcasesort($this->departments);
-
-
- if($empty_tabs_in_front){
-# $numtabs -= $empty_tabs_in_front;
- }
+ uksort($this->departments, 'strnatcasecmp');
+ $this->departments = array_values($this->departments);
/* Add deps to this dialog object list */
foreach($this->departments as $key=> $val){
- /* Add missing entries ... */
- if(!isset($this->config->departments[trim($key)])){
- $this->config->departments[trim($key)]="";
- }
-
- /* check if this department contains sub-departments
- Display different image in this case
- */
- $non_empty="";
- $nkey= normalizePreg($key);
- foreach($this->config->departments as $keyd=>$vald ){
- if(preg_match('/$nkey\/.*/',$keyd)){
- $non_empty="full";
- }
- }
+ /* Check if this department contains sub-departments
+ Display different image in this case
+ */
+ $non_empty="";
+ foreach($this->config->departments as $keyd){
+ if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){
+ $non_empty="-full";
+ }
+ }
- /* Add to divlist */
+ /* Add spacer cols to divlist
+ */
$row = array();
-
if($empty_tabs_in_front){
for($i = 0; $i < $empty_tabs_in_front ; $i ++){
$row[] = array("string"=>" ", "attach" => "style='text-align:center;width:20px;'");
}
}
- $row[]=$field1=array("string"=>"
","attach"=>"style='text-align:center;width:20px;'");
- $row[]=$field2=array("string"=>sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
+ /* Create entry name
+ */
+ $name = $val['ou'][0];
+ if(isset($val['description'])){
+ $name .= " - [".$val["description"][0]."]";
+ }
+
+ /* Add departments
+ */
+ $img = "
";
+ $row[]=$field1=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'");
+ $row[]=$field2=array("string"=>sprintf($linkopen,$key,$name), "attach" => "style=''");
+ /* Add spacer tabs
+ */
if($numtabs > 2){
for($i = 2 ; $i < $numtabs;$i++){
if(isset( $this->array_Header[$i + $empty_tabs_in_front]['attach'])){