X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_MultiSelectWindow.inc;h=175f7fe8a8a375a51fbdfdf4f344778fdf8cde8d;hb=6b427a4efb6d7e4e40ad96ae32a35f61af301d05;hp=c77f07b6497d1a9e1619e30b16b17430bd96ee3c;hpb=daa439eb7255c3dab0261e703c8df4a277a1520a;p=gosa.git
diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index c77f07b64..175f7fe8a 100644
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -33,7 +33,7 @@ class MultiSelectWindow{
var $string_Title = "";
var $string_ListHeader = "";
- var $string_ListDropDown= "";
+ var $string_ListDropDown= "";
var $string_Summary = "";
var $string_Information = "";
@@ -48,9 +48,11 @@ class MultiSelectWindow{
var $is_headpage = false; // if true the design changes
var $filterName = "Liste";
var $DepartmentsAdded = false;
- var $Added_Departments = array();
+ var $Added_Departments = array();
var $selectedBase = "";
+ var $departments= array();
+
var $DivHeight = "";
var $HideFilterPart = false;
@@ -58,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()
{
@@ -113,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');
@@ -140,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');
@@ -369,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("list_summary") == "true"){
$divlist->SetFooter($this->get_List_Bottom_Info());
}
@@ -452,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());
@@ -498,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;
@@ -532,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'];
@@ -547,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])){
@@ -648,10 +654,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*/
@@ -663,25 +666,38 @@ class MultiSelectWindow{
/* Get all departments within this subtree */
$deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
- array("ou", "description"), GL_SIZELIMIT );
+ array("ou", "description","objectClass"), GL_SIZELIMIT );
/* Edit delete link for system types
*/
- $linkopen = "%s";
+ $linkopen = "post_id."&act=dep_open&dep_id=%s'>%s";
/* Create an array with all visible (in the list) departments */
- $departments = array();
- foreach($deps as $value){
- $name = $value['ou'][0]." -".$value['dn'];
- $this->departments[$name]= $value;
- }
+ $types = departmentManagement::get_support_departments();
+
+
+ /* 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');
- $this->departments = array_values($this->departments);
$ui = get_userinfo();
$module_deps = $ui->get_module_departments($this->module);
/* Add deps to this dialog object list */
+ $this->departments = array_values($this->departments);
foreach($this->departments as $key=> $val){
if(!in_array($val['dn'],$module_deps)) continue;
@@ -689,13 +705,15 @@ class MultiSelectWindow{
/* Check if this department contains sub-departments
Display different image in this case
*/
- $non_empty="";
+ $img = $val['TYPE']['IMG'];
foreach($this->config->departments as $keyd){
if(preg_match("/,".normalizePreg($val['dn'])."$/",$keyd)){
- $non_empty="-full";
+ $img = $val['TYPE']['IMG_FULL'];
}
}
+ $img = "";
+
/* Add spacer cols to divlist
*/
$row = array();
@@ -707,14 +725,13 @@ class MultiSelectWindow{
/* Create entry name
*/
- $name = $val['ou'][0];
+ $name = $val['NAME'];
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=''");