X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=8c75dd229719c039815539586f36a6104562a278;hb=3a308e40188042fb56365af23190514a85621963;hp=529196e43288dbac7fb185e72787644f3e5b26d9;hpb=a2a7f9e701d635e3b2a38f0d6f2e1b0bebb5c3a5;p=gosa.git
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 529196e43..8c75dd229 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -1,4 +1,24 @@
get_module_departments($this->module);
+ if(!in_array($this->selectedBase, $deps)){
+ $this->selectedBase = array_shift($deps);
+ }
$this->array_Elements = array();
}
@@ -56,7 +87,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();
@@ -87,8 +118,8 @@ class MultiSelectWindow{
{
if(!empty($this->string_ListDropDown)){
$mid = new LayersMenu(6, 7, 2, 1);
- $mid->setImgwww("./images/");
- $mid->setIcondir("./images/");
+ $mid->setImgwww("./images/layer_menu/");
+ $mid->setIcondir("./images/layer_menu/");
$mid->setDirroot("../include/utils/layer-menu/");
$mid->setHorizontalMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeader.ihtml');
$mid->setSubMenuTpl("../ihtml/".get_template_path("",FALSE).'GOsa_MultiSelectHeaderSubEntry.ihtml');
@@ -114,7 +145,7 @@ class MultiSelectWindow{
$this->CloseButtonString = _("Close");
$this->filterName = $filterName;
$this->ui = get_userinfo();
- $this->selectedBase = session::get('CurrentMainBase');
+ $this->post_id = preg_replace("/[^0-9]/","",microtime(TRUE));
/* Check default values for SaveAdditionalVars */
$MultiDialogFilters = session::get('MultiDialogFilters');
@@ -190,7 +221,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;
@@ -215,33 +246,34 @@ class MultiSelectWindow{
/* Draw root button */
if($enable_root){
- $listhead .= " ";
}else{
- $listhead .= " ";
+ $listhead .= " ";
}
/* Draw back button */
if($enable_back){
- $listhead .= " ";
}else{
- $listhead .= " ";
+ $listhead .= " ";
}
/* Draw home button */
if($enable_home){
- $listhead .= " ";
}else{
- $listhead .= " ";
+ $listhead .= " ";
}
/* And at least draw reload button, this button is enabled everytime */
- $listhead .= " ".
- " ";
-
+ $listhead .= " ";
+ if ($seperator){
+ $listhead.= " ";
+ }
return ($listhead);
}
@@ -291,6 +323,12 @@ class MultiSelectWindow{
return($this->is_closed);
}
+
+ function SetListFooter($str){
+ $this->footer = $str;
+ }
+
+
/* Enable the close button */
function EnableCloseButton($bool)
{
@@ -336,7 +374,7 @@ class MultiSelectWindow{
$divlist->SetEntriesPerPage(0); // 0 for scrollable list
/* Display list footer with summary of all listed entries */
- if(isset($this->config->data['MAIN']['LIST_SUMMARY']) && preg_match("/true/i",$this->config->data['MAIN']['LIST_SUMMARY'])){
+ if ($this->config->get_cfg_value("listSummary") == "true"){
$divlist->SetFooter($this->get_List_Bottom_Info());
}
@@ -375,9 +413,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);
@@ -395,7 +433,7 @@ class MultiSelectWindow{
+ value=\"".htmlspecialchars($regex['value'])."\" title=\"".htmlspecialchars($regex['string'])."\">
|
";
@@ -419,19 +457,19 @@ class MultiSelectWindow{
$smarty->assign("Title" , $this->string_Title);
$smarty->assign("Information" , $this->string_Information);
$smarty->assign("IgnoreAccount" , $this->IgnoreAccount);
+ $smarty->assign("POST_ID", $this->post_id);
/* Check for exeeded sizelimit */
$smarty->assign("hint" , print_sizelimit_warning());
- $smarty->assign("DivList" , $divlist->DrawList());
-
+ $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());
@@ -466,6 +504,14 @@ class MultiSelectWindow{
Store data also into a session var, to keep the checkboxes check after reload */
function save_object()
{
+
+ /* Ensure that we do not handle posts for other dialogs
+ */
+ if((isset($_POST['POST_ID']) && $_POST['POST_ID'] != $this->post_id) ||
+ (isset($_GET['post_id']) && $_GET['post_id'] != $this->post_id)){
+ return;
+ }
+
/* Get up to date config */
if(isset($this->parent->config)){
$this->config = $this->parent->config;
@@ -498,11 +544,12 @@ 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'];
}
}
@@ -515,28 +562,19 @@ class MultiSelectWindow{
}
}
-
/* If Back-button is pressed, move back one step in DN */
if($s_action=="back"){
+
/* Get parent deprtment and check if we are allowed to step in it */
- $base_back= preg_replace("/^[^,]+,/", "", session::get('CurrentMainBase'));
+ $base_back= preg_replace("/^[^,]+,/", "", $this->selectedBase);
$dep_id = $this->ui->get_module_departments($this->module);
if(in_array_ics($base_back,$dep_id)){
-
- /* The department array keeps non DN entries as index. We need to convert
- it before checking the existance. */
- $base_back= trim(convert_department_dn($base_back));
-
- /* Check if the department exists, otherwise revert to the configure base DN */
- if(isset($this->config->departments[$base_back])){
- $this->selectedBase= $this->config->departments[$base_back];
- }else{
- $this->selectedBase= $this->config->departments['/'];
+ if(in_array($base_back,$this->config->departments)){
+ $this->selectedBase = $base_back;
}
}
}
- session::set('CurrentMainBase',$this->selectedBase);
if(isset($_POST['MultiSelectWindow'.$this->filterName])){
@@ -605,57 +643,10 @@ 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);
- }
+ /* Save currenlty selected base in session */
+ session::global_set("CurrentMainBase",$this->selectedBase);
+ }
/* this function adds the sub-departments of the current tree to the list */
@@ -663,77 +654,84 @@ class MultiSelectWindow{
{
$this->DepartmentsAdded = true;
$this->Added_Departments = array();
+ $this->departments = array();
+
+ if(isset($this->Regex)){
+ $this->base_selection_regex = $this->Regex;
+ }
+
+ $linkopen = "post_id."&act=dep_open&dep_id=%s'>%s";
+ $types = departmentManagement::get_support_departments();
+ $ui = get_userinfo();
+ $module_deps = $ui->get_module_departments($this->module);
+ $found_deps = array();
/* check for a valid base */
if(!$base){
- if(!session::is_set('CurrentMainBase')){
- session::set('CurrentMainBase',$this->config->current['BASE']);
- }
- $base = session::get('CurrentMainBase');
+ $base = $this->selectedBase;
}
/* Create ldap obj and switch into base*/
$ldap = $this->config->get_ldap_link();
$ldap->cd($base);
- /* reset current deps */
- $this->departments = array();
-
/* Get all departments within this subtree */
- $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
- array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
-
- /* Edit delete link for system types
- */
- $linkopen = "%s";
-
- /* 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']);
- }
- }
- natcasesort($this->departments);
-
-
- if($empty_tabs_in_front){
-# $numtabs -= $empty_tabs_in_front;
+ $s_filter = "";
+ $s_attrs = array("description","objectClass");
+ $s_acls = $this->module;
+ foreach($types as $name => $data){
+ $s_filter.= "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].")(".$data['ATTR']."=".$this->base_selection_regex."))";
+ $s_attrs[]= $data['ATTR'];
}
-
- /* 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";
- }
- }
+ $tmp = get_list("(|".$s_filter.")",$s_acls,$this->selectedBase,$s_attrs,GL_NONE | GL_SIZELIMIT);
+ foreach($tmp as $attrs){
+ foreach($types as $name => $data){
+ if(in_array($data['OC'],$attrs['objectClass']) && isset($attrs[$data['ATTR']][0])){
+ $attrs['NAME'] = $attrs[$data['ATTR']][0];
+ $attrs['TYPE'] = $data;
+ $name = $attrs['NAME']." ".$attrs['dn'];
+ $departments[$name] = $attrs;
+ $found_deps[$name] = $attrs['dn'];
+ break;
+ }
+ }
+ }
- /* Add to divlist */
+ /* Detect allowed departments
+ */
+ $deps = array_intersect($found_deps,$module_deps);
+ uksort($deps, 'strnatcasecmp');
+ $key = 0;
+ foreach($deps as $name => $dn){
+ $key ++;
+ $val = $departments[$name];
+ $this->departments[$key] = $val;
+ $img = "";
+
+ /* 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['NAME'];
+ if(isset($val['description'])){
+ $name .= " - [".$val["description"][0]."]";
+ }
+
+ /* Add departments
+ */
+ $row[]=array("string"=> $img,"attach"=>"style='text-align:center;width:20px;'");
+ $row[]=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'])){
@@ -748,6 +746,50 @@ class MultiSelectWindow{
}
}
+
+ function create_department_list($modules)
+ {
+ $departments = array();
+ $ui= get_userinfo();
+ $first = "";
+ $found = FALSE;
+ $options ="";
+
+ $ids = $this->config->idepartments;
+ $d = $ui->get_module_departments($modules);
+ $k_ids = array_keys($ids);
+ $deps = array_intersect($d,$k_ids);
+ foreach($k_ids as $department){
+ $departments[$department] = $ids[$department];
+ }
+
+ foreach($departments as $value => $name){
+
+ /* Keep first base dn in mind, we could need this
+ * info if no valid base was found
+ */
+ if(empty($first)) {
+ $first = $value;
+ }
+
+ if ($this->selectedBase == $value){
+ $found = TRUE;
+ $options.= "";
+ } else {
+ $options.= "";
+ }
+ }
+
+ /* The currently used base is not visible with your acl setup.
+ * Set base to first useable base.
+ */
+ if(!$found){
+ $this->selectedBase = $first;
+ }
+
+ return($options);
+ }
+
function set_List_Bottom_Info($str)
{
$this->List_Bottom_Info = $str;