X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=a98004cedfd15a298497412d85422d838906a140;hb=faf9cabfa60510b6cccc9a6a2719856c85d9f3a2;hp=325b7e04749477573da7372b852259279f3e4e16;hpb=5c2a469376614b3c1335e20a6998458057ed7448;p=gosa.git
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 325b7e047..a98004ced 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -60,8 +60,11 @@ class MultiSelectWindow{
var $SaveAdditionalVars = array(); // Additional Post vars to store
var $module= "";
+ var $base_selection_regex = "*";
+
var $IgnoreAccount = TRUE;
var $footer = "";
+ var $post_id = "1 2 3";
function ClearElementsList()
{
@@ -115,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');
@@ -142,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');
@@ -371,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());
}
@@ -454,6 +457,7 @@ 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());
@@ -500,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;
@@ -534,6 +546,7 @@ class MultiSelectWindow{
if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
$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->departments[$s_entry]['dn'];
@@ -549,12 +562,12 @@ 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)){
if(in_array($base_back,$this->config->departments)){
@@ -562,7 +575,6 @@ class MultiSelectWindow{
}
}
}
- session::set('CurrentMainBase',$this->selectedBase);
if(isset($_POST['MultiSelectWindow'.$this->filterName])){
@@ -631,6 +643,9 @@ class MultiSelectWindow{
}
}
}
+
+ /* Save currenlty selected base in session */
+ session::set("CurrentMainBase",$this->selectedBase);
}
@@ -642,10 +657,7 @@ class MultiSelectWindow{
/* 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*/
@@ -661,22 +673,27 @@ class MultiSelectWindow{
/* Edit delete link for system types
*/
- $linkopen = "%s";
+ $linkopen = "%s";
/* Create an array with all visible (in the list) departments */
$types = departmentManagement::get_support_departments();
- $departments = array();
- foreach($deps as $value){
- $name = $value['ou'][0]." -".$value['dn'];
- foreach($types as $type){
- if(in_array($type['OC'],$value['objectClass'])){
- $value['type'] = $type;
- break;
- }
- }
- $this->departments[$name]= $value;
- }
+
+ /* Create search filter
+ */
+ $this->departments = array();
+ foreach($types as $name => $data){
+ $filter = "(&(objectClass=gosaDepartment)(objectClass=".$data['OC'].")
+ (".$data['ATTR']."=".$this->base_selection_regex."))";
+ $tmp = get_list($filter,"department/".$data['ACL'],$this->selectedBase,array($data['ATTR'],"description"),GL_NONE);
+ foreach($tmp as $attrs){
+ $attrs['NAME'] = $attrs[$data['ATTR']][0];
+ $attrs['TYPE'] = $data;
+ $name = $attrs['NAME']." -".$attrs['dn'];
+ $this->departments[$name] = $attrs;
+ }
+ }
+
uksort($this->departments, 'strnatcasecmp');
$ui = get_userinfo();
@@ -691,10 +708,10 @@ class MultiSelectWindow{
/* Check if this department contains sub-departments
Display different image in this case
*/
- $img = $val['type']['IMG'];
+ $img = $val['TYPE']['IMG'];
foreach($this->config->departments as $keyd){
if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){
- $img = $val['type']['IMG_FULL'];
+ $img = $val['TYPE']['IMG_FULL'];
}
}
@@ -711,7 +728,7 @@ class MultiSelectWindow{
/* Create entry name
*/
- $name = $val['ou'][0];
+ $name = $val['NAME'];
if(isset($val['description'])){
$name .= " - [".$val["description"][0]."]";
}