![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index e8e028bc950ba04bdcc9e6ae61b38905a6869bb7..6bf78f1545b001fa94d68605f8923a3467ff036a 100644 (file)
function execute()
{
- /* Call parent execute */
-// plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
+
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/");
/* Save data */
$groupfilter= get_global("groupfilter");
/* Test Posts */
foreach($_POST as $key => $val){
// Post for delete
- if(preg_match("/group_del.*/",$key)){
+ if(preg_match("/^group_del.*/",$key)){
$s_action = "del";
$s_entry = preg_replace("/group_".$s_action."_/i","",$key);
// Post for edit
- }elseif(preg_match("/group_edit_.*/",$key)){
+ }elseif(preg_match("/^group_edit_.*/",$key)){
$s_action="edit";
$s_entry = preg_replace("/group_".$s_action."_/i","",$key);
// Post for new
- }elseif(preg_match("/dep_back.*/i",$key)){
+ }elseif(preg_match("/^dep_back.*/i",$key)){
$s_action="back";
- }elseif(preg_match("/group_new.*/",$key)){
+ }elseif(preg_match("/^group_new.*/",$key)){
$s_action="new";
- }elseif(preg_match("/dep_home.*/i",$key)){
+ }elseif(preg_match("/^dep_home.*/i",$key)){
$s_action="home";
- }elseif(preg_match("/group_tplnew.*/i",$key)){
+ }elseif(preg_match("/^group_tplnew.*/i",$key)){
$s_action="new_tpl";
- }elseif(preg_match("/group_chgpw.*/i",$key)){
+ }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)){
+ }elseif(preg_match("/^dep_root.*/i",$key)){
$s_action="root";
+ }elseif(preg_match("/_group_edit_/",$key)){
+ $type = preg_replace("/_group_edit_.*$/","",$key);
+ $s_action="edit";
+ $s_entry = preg_replace("/".$type."_group_edit_/i","",$key);
+ $_POST['arg'] = $type;
}
}
$s_entry = preg_replace("/_.$/","",$s_entry);
/* Create new usertab object */
$this->grouptab= new grouptabs($this->config,
$this->config->data['TABS']['GROUPTABS'], $this->dn);
+ /* Set up the users ACL's for this 'dn' */
+ $acl= get_permissions ($groupfilter['depselect'], $this->ui->subtreeACL);
+ $this->grouptab->set_acl($acl);
}
/* Cancel dialogs */
/* Finish group edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
- if (isset($_POST['edit_finish'])){
+ if ((isset($_POST['edit_finish'])) && (isset($this->grouptab->config)) ){
/* Check tabs, will feed message array */
$message= $this->grouptab->check();
}
/* User wants to edit data? */
- if ($s_action=="edit"){
+ if (($s_action=="edit") && (!isset($this->grouptab-> config))){
/* Get 'dn' from posted 'uid', must be unique */
$this->dn= $this->grouplist[trim($s_entry)]['dn'];
/* Lock the current entry, so nobody will edit it during deletion */
add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("info", sprintf(_("You're about to delete the group '%s'."), $this->dn));
+ $smarty->assign("info", sprintf(_("You're about to delete the group '%s'."), LDAP::fix($this->dn)));
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
} else {
}
/* Show tab dialog if object is present */
- if ($this->grouptab){
+ if (isset($this->grouptab->config)){
$display= $this->grouptab->execute();
/* Don't show buttons if tab dialog requests this */
" <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'> ".
" <input type='image' class='center' src='images/list_new_group.png' title='"._("Create new group")."' alt='"._("New")."' name='group_new'> ".
" <img class='center' src='images/list_seperator.png' alt='' height='16' width='1'> ".
- _("Current base")." <select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
+ _("Base")." <select name='depselect' onChange='mainform.submit()' class='center'>$options</select>".
" <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
"</div>";
$editlink = "<a href='?plug=".$_GET['plug']."&id=%s&act=edit_entry'>%s</a>";
$userimg = "<img class='center' src='images/select_groups.png' alt='User' title='%s'>";
- // Extension images
- $posiximg = "<img class='center' src='images/select_groups.png' alt='P' title='"._("Posix") ."'>";
- $mailimg = "<img class='center' src='images/mailto.png' alt='M' title='"._("Mail") ."'>";
- $sambaimg = "<img class='center' src='images/select_winstation.png' alt='S' title='"._("Samba") ."'>";
- $applimg = "<img class='center' src='images/select_application.png' alt='A' title='"._("Application")."'>";
- $phoneimg = "<img class='center' src='images/select_phone.png' alt='Ph' title='"._("Phone") ."'>";
- $envimg = "<img class='center' src='images/network.png' alt='E' title='"._("Environment") ."'>";
+
+ /* Extension images
+ group
+ environment
+ appgroup
+ mailgroup
+ acl
+ reference
+
+ */
+ $posiximg = "<input type='image' class='center' src='images/select_groups.png'
+ name='group_group_edit_%KEY%'
+ alt='P' title='"._("Posix") ."'>";
+ $mailimg = "<input type='image' class='center' src='images/mailto.png'
+ name='mailgroup_group_edit_%KEY%'
+ alt='M' title='"._("Mail") ."'>";
+ $sambaimg = "<input type='image' class='center' src='images/select_winstation.png'
+ name='group_group_edit_%KEY%'
+ alt='S' title='"._("Samba") ."'>";
+ $applimg = "<input type='image' class='center' src='images/select_application.png'
+ name='appgroup_group_edit_%KEY%'
+ alt='A' title='"._("Application")."'>";
+ $phoneimg = "<input type='image' class='center' src='images/select_phone.png'
+ name='group_group_edit_%KEY%'
+ alt='Ph' title='"._("Phone") ."'>";
+ $envimg = "<input type='image' class='center' src='images/smallenv.png'
+ name='environment_group_edit_%KEY%'
+ alt='E' title='"._("Environment") ."'>";
+
// Space
$empty = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
}
$field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
$field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
- $field3 = array("string" => $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone, "attach" => "style='width:136px;'");
+ $field3 = array("string" => preg_replace("/%KEY%/", $key, $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone), "attach" => "style='width:136px;'");
$field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
$divlist->AddEntry(array($field1,$field2,$field3,$field4));
$smarty->assign("apply", apply_filter());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("hint", print_sizelimit_warning());
+ if (isset($this->config->data['MAIN']['NOPRIMARYGROUP'])){
+ $smarty->assign("showprimary", "");
+ } else {
+ $smarty->assign("showprimary", "true");
+ }
return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
}
/* What are primary groups? */
$primaries= array();
$ldap= $this->config->get_ldap_link();
- $ldap->cd($base);
- $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
- show_ldap_error($ldap->get_error());
- while ($attrs= $ldap->fetch()){
- $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0];
+ if (!isset($this->config->data['MAIN']['NOPRIMARYGROUP'])){
+ $ldap->cd($base);
+ $ldap->search("(&(uid=$regex)(!(uid=*$))(objectClass=posixAccount)(gidNumber=*))", array("gidNumber", "cn"));
+ show_ldap_error($ldap->get_error());
+ while ($attrs= $ldap->fetch()){
+ $primaries[$attrs['gidNumber'][0]]= $attrs['cn'][0];
+ }
}
/* Set filter depending on selection */
}
}
-
-
-
-
-
-
-
/*
* We also need to search for the departments
* So we are able to navigate like in konquerer
*/
- /* Only needed if we are in GroupManagement */
- if(!$CreatePosixsList){
$res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
FALSE, $base, array("ou", "description"), TRUE);
$this->departments= array();
$this->departments[$value['dn']]= convert_department_dn2($value['dn']);//$value["description"][0];
}
}
- }
/* Ende department generation
*/
$tmp=array();
- /* If true ; this result is used for posix tab, group membership selection. */
- if($CreatePosixsList){
-
- /* Addd to array */
- foreach($this->grouplist as $tkey => $val ){
- $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
- }
-
- /* Sort index */
- ksort($tmp);
-
- /* Recreate index array[dn]=cn[description]*/
- $this->grouplist=array();
- foreach($tmp as $val){
- if(isset($val['description'])){
- $this->grouplist[$val['dn']]=$val['cn'][0]." [".$val['description'][0]."]";
- }else{
- $this->grouplist[$val['dn']]=$val['cn'][0];
- }
- }
- }else{
-
- /* Create result for group management listbox*/
- foreach($this->grouplist as $tkey => $val ){
- $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
- }
- ksort($tmp);
- $this->grouplist=array();
- foreach($tmp as $val){
- $this->grouplist[]=$val;
- }
- reset ($this->grouplist);
+ /* Create result for group management listbox*/
+ foreach($this->grouplist as $tkey => $val ){
+ $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
+ }
+ ksort($tmp);
+ $this->grouplist=array();
+ foreach($tmp as $val){
+ $this->grouplist[]=$val;
}
+ reset ($this->grouplist);
}
function remove_from_parent()