From 123d43f0853813d491e8eba7ef16927cf8846ec0 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 15 May 2006 11:20:52 +0000 Subject: [PATCH] Add new ogroup div list class git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3337 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/ogroups/class_divListGroup.inc | 2 +- .../admin/ogroups/class_ogroupManagement.inc | 486 ++++-------------- 2 files changed, 106 insertions(+), 382 deletions(-) diff --git a/plugins/admin/ogroups/class_divListGroup.inc b/plugins/admin/ogroups/class_divListGroup.inc index aa2339f32..e1656f2d1 100755 --- a/plugins/admin/ogroups/class_divListGroup.inc +++ b/plugins/admin/ogroups/class_divListGroup.inc @@ -52,7 +52,7 @@ class divListOGroup extends MultiSelectWindow $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); $this->AddHeader(array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''")); $this->AddHeader(array("string" => _("Properties"), "attach" => "style='width:136px;'")); - $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:80;border-right:0px;text-align:right;'")); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:107px;border-right:0px;text-align:right;'")); /* Text ,Value ,Name ,Is selected */ $this->AddCheckBox("UserGroups" , _("") , _("Show groups containing users"), true); diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc index a626537cd..82b7bb6a5 100644 --- a/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/plugins/admin/ogroups/class_ogroupManagement.inc @@ -31,10 +31,8 @@ class ogroupManagement extends plugin var $obtypes= array(); var $ogroup; - var $CopyPasteHandler ; - - var $enableCopyPaste = false; - + var $CopyPasteHandler = NULL; + var $DivListOGroup = NULL; function ogroupManagement ($config, $dn= NULL) { @@ -45,88 +43,28 @@ class ogroupManagement extends plugin /* Copy & Paste enabled ? */ if((isset($this->config->data['MAIN']['ENABLECOPYPASTE']))&&(preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE'] ))){ - $this->enableCopyPaste = true; + $this->CopyPasteHandler = new CopyPasteHandler($this->config); } - $this->CopyPasteHandler = new CopyPasteHandler($this->config); - - /* Fill translation array */ - $this->obtypes= array( "posixAccount" => _("UNIX accounts"), - "posixGroup" => _("Groups"), - "gosaDepartment" => _("Departments"), - "gosaApplication" => _("Applications"), - "goServer" => _("Servers"), - "gotoTerminal" => _("Thin Clients"), - "gotoWorkstation" => _("Workstations"), - "goFonHardware" => _("Phone"), - "gotoPrinter" => _("Printer")); - asort($this->obtypes); - - /* Get global filter config */ - if (!is_global("ogroupfilter")){ - $ui= get_userinfo(); - $base= get_base_from_people($ui->dn); - $ogroupfilter= array( "usergroups" => "checked", - "groupgroups" => "checked", - "appgroups" => "checked", - "depgroups" => "checked", - "servergroups" => "checked", - "wsgroups" => "checked", - "prtgroups" => "checked", - "tcgroups" => "checked", - "fongroups" => "checked", - "regex" => "*"); - register_global("ogroupfilter", $ogroupfilter); - } - if(!isset($_SESSION['CurrentMainBase'])){ - $ui= get_userinfo(); - $base= get_base_from_people($ui->dn); - $_SESSION['CurrentMainBase'] = $base; - } + /* Div lsit management */ + $this->DivListOGroup = new divListOGroup($this->config,$this); } function execute() { - /* Call parent execute */ - plugin::execute(); + /* Call parent execute */ + plugin::execute(); - $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/"); + /**************** + Variable intialisation && Check posts for commands + ****************/ - /* Prepare template */ - $smarty= get_smarty(); + $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/"); - $ogroupfilter= get_global("ogroupfilter"); + $smarty = get_smarty(); $s_action = ""; $s_entry = ""; - foreach( array("regex") as $type){ - if (isset($_POST[$type])){ - $ogroupfilter[$type]= $_POST[$type]; - } - } - if(isset($_POST['CurrentMainBase'])){ - $_SESSION['CurrentMainBase'] = $_POST['CurrentMainBase']; - } - - if (isset($_POST['Ogroup_dialog_posted'])){ - foreach( array("usergroups", "groupgroups", "appgroups", "depgroups", - "servergroups", "wsgroups", "prtgroups", "tcgroups", "fongroups") as $type){ - - if (isset($_POST[$type])) { - $ogroupfilter[$type]= "checked"; - } else { - $ogroupfilter[$type]= ""; - } - } - } - if (isset($_GET['search'])){ - $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*"; - if ($s == "**"){ - $s= "*"; - } - $ogroupfilter['regex']= $s; - } - /* Test Posts */ foreach($_POST as $key => $val){ // Post for delete @@ -138,19 +76,13 @@ class ogroupManagement extends plugin $s_action="edit"; $s_entry = preg_replace("/^group_".$s_action."_/i","",$key); // Post for new - }elseif(preg_match("/^dep_back.*/i",$key)){ - $s_action="back"; }elseif(preg_match("/^group_new.*/",$key)){ $s_action="new"; - }elseif(preg_match("/^dep_home.*/i",$key)){ - $s_action="home"; }elseif(preg_match("/^group_tplnew.*/i",$key)){ $s_action="new_tpl"; }elseif(preg_match("/^group_chgpw.*/i",$key)){ $s_action="change_pw"; $s_entry = preg_replace("/group_chgpw_/i","",$key); - }elseif(preg_match("/^dep_root.*/i",$key)){ - $s_action="root"; }elseif(preg_match("/^editPaste.*/i",$key)){ $s_action="editPaste"; }elseif(preg_match("/^copy_.*/",$key)){ @@ -167,42 +99,6 @@ class ogroupManagement extends plugin } } $s_entry = preg_replace("/_.$/","",$s_entry); - - /* Department changed? */ - if(isset($_POST['CurrentMainBase']) && $_POST['CurrentMainBase']){ - $_SESSION['CurrentMainBase'] = $_POST['CurrentMainBase']; - } - - /* Start for New List Managment */ - if(isset($_GET['act'])&&($_GET['act']=="dep_open")){ - $s_action="open"; - $s_entry = base64_decode($_GET['dep_id']); - $_SESSION['CurrentMainBase'] = "".$this->config->departments[trim($s_entry)]; - } - - /* If Backbutton is Posted */ - if($s_action=="back"){ - $base_back = preg_replace("/^[^,]+,/","", $_SESSION['CurrentMainBase']); - $base_back = convert_department_dn($base_back); - - if(isset($this->config->departments[trim($base_back)])){ - $_SESSION['CurrentMainBase']= $this->config->departments[trim($base_back)]; - }else{ - $_SESSION['CurrentMainBase']= $this->config->departments["/"]; - } - register_global("ogroupfilter", $ogroupfilter); - } - - /* Homebutton is posted */ - if($s_action=="home"){ - $_SESSION['CurrentMainBase']=(preg_replace("/^[^,]+,/","",$this->ui->dn)); - $_SESSION['CurrentMainBase']=(preg_replace("/^[^,]+,/","", $_SESSION['CurrentMainBase'])); - } - - /* root posted */ - if($s_action=="root"){ - $_SESSION['CurrentMainBase']=($this->config->current['BASE']); - } // Edit if if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){ @@ -210,28 +106,23 @@ class ogroupManagement extends plugin $s_entry = $_GET['id']; } - register_global("ogroupfilter", $ogroupfilter); - - $this->reload(); - /* Check for exeeded sizelimit */ - if (($message= check_sizelimit()) != ""){ - return($message); - } + /**************** + Copy & Paste handling + ****************/ /* Only perform copy / paste if it is enabled */ - if($this->enableCopyPaste){ - - /* Paste copied/cutted object in here + if($this->CopyPasteHandler){ + + /* Paste copied/cutted object in here */ if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){ $this->CopyPasteHandler->save_object(); - $this->CopyPasteHandler->SetVar("base", $_SESSION['CurrentMainBase']); + $this->CopyPasteHandler->SetVar("base", $this->DivListOGroup->selectedBase); return($this->CopyPasteHandler->execute()); } - /* Copy current object to CopyHandler */ if($s_action == "copy"){ @@ -242,7 +133,6 @@ class ogroupManagement extends plugin $this->CopyPasteHandler->Copy($obj,$objNew); } - /* Copy current object to CopyHandler */ if($s_action == "cut"){ @@ -253,6 +143,11 @@ class ogroupManagement extends plugin } } + + /**************** + Create a new object group + ****************/ + /* New group? */ if ($s_action=="new"){ @@ -262,9 +157,14 @@ class ogroupManagement extends plugin /* Create new usertab object */ $this->ogroup= new ogrouptabs($this->config, - $this->config->data['TABS']['OGROUPTABS'], $this->dn); + $this->config->data['TABS']['OGROUPTABS'], $this->dn); } + + /**************** + Delete object group + ****************/ + if ($s_action=="del"){ /* Get 'dn' from posted 'uid' */ @@ -294,6 +194,11 @@ class ogroupManagement extends plugin } } + + /**************** + Delete confirmed + ****************/ + /* Confirmation for deletion has been passed. Group should be deleted. */ if (isset($_POST['delete_group_confirm'])){ @@ -303,15 +208,12 @@ class ogroupManagement extends plugin /* Delete request is permitted, perform LDAP action */ $this->ogroup= new ogrouptabs($this->config, - $this->config->data['TABS']['OGROUPTABS'], $this->dn); + $this->config->data['TABS']['OGROUPTABS'], $this->dn); $this->ogroup->set_acl(array($this->acl)); $this->ogroup->delete (); gosa_log ("Object group'".$this->dn."' has been removed"); unset ($this->ogroup); $this->ogroup= NULL; - - /* Group list has changed, reload it. */ - $this->reload (); } else { /* Normally this shouldn't be reached, send some extra @@ -326,12 +228,21 @@ class ogroupManagement extends plugin } + /**************** + Delete object group Canceled + ****************/ + /* Delete group canceled? */ if (isset($_POST['delete_cancel'])){ del_lock ($this->dn); unset($_SESSION['objectinfo']); } + + /**************** + Edit group + ****************/ + if (($s_action=="edit") && (! isset($this->ogroup->config)) ){ /* Get 'dn' from posted 'uid', must be unique */ @@ -357,6 +268,11 @@ class ogroupManagement extends plugin $_SESSION['objectinfo']= $this->dn; } + + /**************** + Edit finished save + ****************/ + /* Finish button has been pressed */ if ((isset($_POST['edit_finish'])) && (isset($this->ogroup->config)) ){ @@ -376,9 +292,6 @@ class ogroupManagement extends plugin del_lock ($this->dn); } - /* There's no page reload so we have to read new users at - this point. */ - $this->reload (); unset ($this->ogroup); $this->ogroup= NULL; unset ($_SESSION['objectinfo']); @@ -390,6 +303,11 @@ class ogroupManagement extends plugin } } + + /**************** + Cancel edit object group + ****************/ + /* Cancel dialogs */ if (isset($_POST['edit_cancel'])){ del_lock ($this->ogroup->dn); @@ -398,6 +316,11 @@ class ogroupManagement extends plugin unset($_SESSION['objectinfo']); } + + /**************** + Display open dialogs + ****************/ + /* Show dialog if object is present */ if (isset($this->ogroup->config)){ $display= $this->ogroup->execute(); @@ -413,172 +336,21 @@ class ogroupManagement extends plugin return ($display); } - /* Prepare departments */ - $options= ""; - foreach ($this->config->idepartments as $key => $value){ - if ($_SESSION['CurrentMainBase'] == $key){ - $options.= ""; - } else { - $options.= ""; - } - } - - /* Create paste icon - * This icon is only displayed if copy & paste is enabled - */ - if($this->enableCopyPaste){ - $Copy_Paste = "  "; - if($this->CopyPasteHandler->isCurrentObjectPastAble()){ - if($this->CopyPasteHandler->isCurrentCutted()){ - $img = "images/cutpaste.png"; - }else{ - $img = "images/copypaste.png"; - } - $Copy_Paste .= " "; - }else{ - $Copy_Paste .= ""._("Can "; - } - }else{ - $Copy_Paste =""; - } + /**************** + Display list + ****************/ + /* Display dialog with group list */ + $this->DivListOGroup->execute(); - // Managment - $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - " ". - $Copy_Paste. - "  ". - _("Base")." ". - "  ". - "
"; - - - /* Add Copy & Paste buttons if copy&paste is enabled - */ - if($this->enableCopyPaste){ - $actions = " "; - $actions.= " "; - $actions.= ""; - $actions.= ""; - }else{ - $actions = ""; - $actions.= ""; + /* Add departments if subsearch is disabled */ + if(!$this->DivListOGroup->SubSearch){ + $this->DivListOGroup->AddDepartments($this->DivListOGroup->selectedBase,4); } - - - // Defining Links - $linkopen = "%s"; - - // image Buttons - $editlink = "%s"; - $userimg = "User"; - - // Extension images - $mailimg = "M"; - - // Space - $empty = ""; - - // List Setup - $divlist = new divlist("ogroubstab"); - $divlist->SetHeader(array( - array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), - array("string" => _("Name of object groups")." / "._("Departments"), "attach" => "style=''"), - array("string" => _("Properties"), "attach" => "style='width:136px;'"), - array("string" => _("Actions"), "attach" => "style='width:80;border-right:0px;text-align:right;'") - )); - - - $divlist->SetSummary(_("This table displays all groups, in the selected tree.")); - $divlist->SetEntriesPerPage(0); - - foreach($this->departments as $key=> $val){ - - if(!isset($this->config->departments[trim($key)])){ - $this->config->departments[trim($key)]=""; - } - - $non_empty=""; - $keys= str_replace("/","\/",$key); - foreach($this->config->departments as $keyd=>$vald ){ - if(preg_match("/".$keys."\/.*/",$keyd)){ - $non_empty="full"; - } - } - - - - $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:136px;'"); - $field4 = array("string" => " ", "attach" => "style='width:80;border-right:0px;text-align:right;'"); - - $divlist->AddEntry(array($field1,$field2,$field3,$field4)); - } - - // Assigning ogroups - foreach($this->ogrouplist as $key => $val){ - - if(isset($val['mail'])){ - $mail = $mailimg; - }else{ - $mail = $empty; - } - - $title = "title='dn: ".@LDAP::fix($val['dn'])."'"; - - if(!isset($val['description'][0])){ - $desc = ""; - }else{ - $desc = " - [ ".$val['description'][0]." ]"; - } - $field1 = array("string" => ""._("Object group")."", "attach" => "style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title); - $field3 = array("string" => preg_replace("/%KEY/", $key, $this->convert_list($val))." ".$mail, "attach" => "style='width:136px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:80;border-right:0px;text-align:right;'"); - - $divlist->AddEntry(array($field1,$field2,$field3,$field4)); - } - - - - - - - /* Show main page */ - $smarty->assign("search_image", get_template_path('images/search.png')); - $smarty->assign("tree_image", get_template_path('images/tree.png')); - $smarty->assign("infoimage", get_template_path('images/info.png')); - $smarty->assign("launchimage", get_template_path('images/launch.png')); - $smarty->assign("deplist", $this->config->idepartments); - - $smarty->assign("groupshead", $listhead); - $smarty->assign("groups", $divlist->DrawList()); - - foreach( array("usergroups", "groupgroups", "appgroups", "depgroups", - "servergroups", "wsgroups", "prtgroups", "tcgroups", "fongroups", "regex" ) as $type){ - $smarty->assign("$type", $ogroupfilter[$type]); - } - $smarty->assign("CurrentMainBase" , $_SESSION['CurrentMainBase']); - $smarty->assign("hint", print_sizelimit_warning()); - $smarty->assign("apply", apply_filter()); - $smarty->assign("alphabet", generate_alphabet()); - return ($smarty->fetch (get_template_path('headpage.tpl', TRUE))); + $this->reload (); + $this->DivListOGroup->setEntries($this->ogrouplist); + return($this->DivListOGroup->Draw()); } @@ -586,7 +358,6 @@ name='dep_root' alt='"._("Root")."'> ". { $temp= ""; - $conv= array( "U" => array("select_user.png" ,_("User") , "ogroup"), "G" => array("select_groups.png" ,_("Group") , "ogroup"), @@ -625,101 +396,48 @@ name='dep_root' alt='"._("Root")."'> ". $p2['lnk']= ""; //$conv[$type[0]][2]; } $temp = ""; + src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>"; $temp.= ""; + src='images/".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>"; return ($temp); } function reload() { - /* Get config */ - $ogroupfilter= get_global('ogroupfilter'); - - /* Set base for all searches */ - $base= $_SESSION['CurrentMainBase']; - - /* Regex filter? */ - if ($ogroupfilter['regex'] != ""){ - $regex= $ogroupfilter['regex']; - } else { - $regex= "*"; - } - - /* User filter? */ + /* Set base for all searches && initialise some vars */ $this->oogrouplist= array(); - - /* Generate oogrouplist filter */ - $filter= ""; - - if ($ogroupfilter['usergroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*U*)"; - } - if ($ogroupfilter['groupgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*G*)"; - } - if ($ogroupfilter['appgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*A*)"; - } - if ($ogroupfilter['depgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*D*)"; - } - if ($ogroupfilter['servergroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*S*)"; - } - if ($ogroupfilter['wsgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*W*)"; - } - if ($ogroupfilter['prtgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*P*)"; - } - if ($ogroupfilter['tcgroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*T*)"; - } - if ($ogroupfilter['fongroups'] == "checked"){ - $filter.= "(gosaGroupObjects=*F*)"; + $base = $this->DivListOGroup->selectedBase; + $filter = "(gosaGroupObjects=[])"; + $Regex = $this->DivListOGroup->Regex; + + $chk = array( + "UserGroups" => "(gosaGroupObjects=*U*)" , + "GroupGroups" => "(gosaGroupObjects=*G*)" , + "ApplicationGroups" => "(gosaGroupObjects=*A*)" , + "DepartmentGroups" => "(gosaGroupObjects=*D*)" , + "ServerGroups" => "(gosaGroupObjects=*S*)" , + "WorkstationGroups" => "(gosaGroupObjects=*W*)" , + "TerminalGroups" => "(gosaGroupObjects=*T*)" , + "PrinterGroups" => "(gosaGroupObjects=*P*)" , + "PhoneGroups" => "(gosaGroupObjects=*F*)" ); + /* Create filter */ + foreach($chk as $chkBox => $FilterPart){ + if($this->DivListOGroup->$chkBox){ + $filter .= $FilterPart; + } } - $filter.= "(gosaGroupObjects=[])"; + $filter= "(&(cn=$Regex)(objectClass=gosaGroupOfNames)(|$filter))"; - if ($filter != ""){ - $filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames)(|$filter))"; - } else { - $filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames))"; + if($this->DivListOGroup->SubSearch){ + $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT | GL_SUBSEARCH); + }else{ + $res= get_list($filter, $this->ui->subtreeACL, get_groups_ou().$base, array("cn","objectClass","gosaGroupObjects"), GL_SIZELIMIT ); } - - $res= get_list($filter, $this->ui->subtreeACL, get_groups_ou().$base, array("*"), GL_SIZELIMIT ); + $this->ogrouplist= $res; ksort ($this->ogrouplist); reset ($this->ogrouplist); - - - /* NEW LIST MANAGMENT - * We also need to search for the departments - * So we are able to navigate like in konquerer - */ - $peopleOU = get_people_ou(); - - if(empty($peopleOU)){ - $base2 = $base; - }else{ - $base2 = preg_replace("/".$peopleOU."/i","",$base); - } - - /* Get all departments within this subtree */ - $deps= get_list("(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))", $this->ui->subtreeACL, - $base2, array("ou", "description"), GL_SIZELIMIT | GL_CONVERT); - - $this->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); - $tmp=array(); foreach($this->ogrouplist as $tkey => $val ){ $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; @@ -731,6 +449,12 @@ name='dep_root' alt='"._("Root")."'> ". } reset ($this->ogrouplist); } + + function save_object() + { + $this->DivListOGroup->save_object(); + } + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -- 2.30.2