![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 577bd17423ccc974d0c93470d68ad443f497ce24..a626537cdc8cac74bd5e24ccf2e7b6d3fddb3e46 100644 (file)
var $obtypes= array();
var $ogroup;
+ var $CopyPasteHandler ;
+
+ var $enableCopyPaste = false;
+
+
function ogroupManagement ($config, $dn= NULL)
{
/* Include config object */
$this->config= $config;
$this->ui= get_userinfo();
+ /* 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);
+
/* Fill translation array */
$this->obtypes= array( "posixAccount" => _("UNIX accounts"),
"posixGroup" => _("Groups"),
"prtgroups" => "checked",
"tcgroups" => "checked",
"fongroups" => "checked",
- "depselect" => $base,
"regex" => "*");
register_global("ogroupfilter", $ogroupfilter);
}
+ if(!isset($_SESSION['CurrentMainBase'])){
+ $ui= get_userinfo();
+ $base= get_base_from_people($ui->dn);
+ $_SESSION['CurrentMainBase'] = $base;
+ }
}
function execute()
{
- /* Call parent execute */
- plugin::execute();
+ /* Call parent execute */
+ plugin::execute();
+
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/");
/* Prepare template */
$smarty= get_smarty();
$s_action = "";
$s_entry = "";
- foreach( array("depselect", "regex") as $type){
+ 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){
/* 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);
+ $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);
+ $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("/^editPaste.*/i",$key)){
+ $s_action="editPaste";
+ }elseif(preg_match("/^copy_.*/",$key)){
+ $s_action="copy";
+ $s_entry = preg_replace("/^copy_/i","",$key);
+ }elseif(preg_match("/^cut_.*/",$key)){
+ $s_action="cut";
+ $s_entry = preg_replace("/^cut_/i","",$key);
+ }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);
-
+
/* Department changed? */
- if(isset($_POST['depselect']) && $_POST['depselect']){
- $ogroupfilter['depselect']= $_POST['depselect'];
+ 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']);
- $ogroupfilter['depselect']= "".$this->config->departments[trim($s_entry)];
+ $_SESSION['CurrentMainBase'] = "".$this->config->departments[trim($s_entry)];
}
/* If Backbutton is Posted */
if($s_action=="back"){
- $base_back = preg_replace("/^[^,]+,/","",$ogroupfilter['depselect']);
+ $base_back = preg_replace("/^[^,]+,/","", $_SESSION['CurrentMainBase']);
$base_back = convert_department_dn($base_back);
if(isset($this->config->departments[trim($base_back)])){
- $ogroupfilter['depselect']= $this->config->departments[trim($base_back)];
+ $_SESSION['CurrentMainBase']= $this->config->departments[trim($base_back)];
}else{
- $ogroupfilter['depselect']= $this->config->departments["/"];
+ $_SESSION['CurrentMainBase']= $this->config->departments["/"];
}
register_global("ogroupfilter", $ogroupfilter);
}
/* Homebutton is posted */
if($s_action=="home"){
- $ogroupfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
- $ogroupfilter['depselect']=(preg_replace("/^[^,]+,/","",$ogroupfilter['depselect']));
+ $_SESSION['CurrentMainBase']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
+ $_SESSION['CurrentMainBase']=(preg_replace("/^[^,]+,/","", $_SESSION['CurrentMainBase']));
}
/* root posted */
if($s_action=="root"){
- $ogroupfilter['depselect']=($this->config->current['BASE']);
+ $_SESSION['CurrentMainBase']=($this->config->current['BASE']);
}
// Edit if
return($message);
}
+ /* Only perform copy / paste if it is enabled
+ */
+ if($this->enableCopyPaste){
+
+ /* Paste copied/cutted object in here
+ */
+ if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
+ $this->CopyPasteHandler->save_object();
+ $this->CopyPasteHandler->SetVar("base", $_SESSION['CurrentMainBase']);
+ return($this->CopyPasteHandler->execute());
+ }
+
+
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "copy"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->ogrouplist[$s_entry]['dn'];
+ $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
+ $objNew = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], "new");
+ $this->CopyPasteHandler->Copy($obj,$objNew);
+ }
+
+
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "cut"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->ogrouplist[$s_entry]['dn'];
+ $obj = new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $dn);
+ $this->CopyPasteHandler->Cut($obj);
+ }
+ }
+
/* New group? */
if ($s_action=="new"){
/* 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 object group '%s'."), $this->dn));
+ $smarty->assign("info", sprintf(_("You're about to delete the object group '%s'."), @LDAP::fix($this->dn)));
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
} else {
unset($_SESSION['objectinfo']);
}
- if ($s_action=="edit"){
+ if (($s_action=="edit") && (! isset($this->ogroup->config)) ){
/* Get 'dn' from posted 'uid', must be unique */
$this->dn= $this->ogrouplist[$s_entry]['dn'];
}
/* Finish button has been pressed */
- if (isset($_POST['edit_finish'])){
+ if ((isset($_POST['edit_finish'])) && (isset($this->ogroup->config)) ){
/* Check tabs, will feed message array */
$message= $this->ogroup->check();
}
/* Show dialog if object is present */
- if ($this->ogroup){
+ if (isset($this->ogroup->config)){
$display= $this->ogroup->execute();
/* Don't show buttons if tab dialog requests this */
if (!$this->ogroup->by_object[$this->ogroup->current]->dialog){
$display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
+ $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
$display.= " \n";
$display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
$display.= "</p>";
/* Prepare departments */
$options= "";
foreach ($this->config->idepartments as $key => $value){
- if ($ogroupfilter['depselect'] == $key){
+ if ($_SESSION['CurrentMainBase'] == $key){
$options.= "<option selected value='$key'>$value</option>";
} else {
$options.= "<option value='$key'>$value</option>";
}
}
+
+ /* Create paste icon
+ * This icon is only displayed if copy & paste is enabled
+ */
+ if($this->enableCopyPaste){
+ $Copy_Paste = " <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ";
+ if($this->CopyPasteHandler->isCurrentObjectPastAble()){
+ if($this->CopyPasteHandler->isCurrentCutted()){
+ $img = "images/cutpaste.png";
+ }else{
+ $img = "images/copypaste.png";
+ }
+ $Copy_Paste .= "<input type='image' name='editPaste' class='center'
+ src='".$img."' alt='"._("Paste")."' title='".$this->CopyPasteHandler->GetCurrentDn()."'> ";
+ }else{
+ $Copy_Paste .= "<img class='center' src='images/cant_editpaste.png' alt='"._("Can't paste")."'> ";
+ }
+ }else{
+ $Copy_Paste ="";
+ }
+
+
// Managment
$listhead = "<div style='background:#F0F0F9;padding:5px;'>".
- " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ".
" <input class='center' type='image' src='images/list_root.png' align='middle' title='"._("Go to root department")."'
name='dep_root' alt='"._("Root")."'> ".
+ " <input class='center' type='image' align='middle' src='images/list_back.png' title='"._("Go up one department")."' alt='"._("Up")."' name='dep_back'> ".
" <input class='center' type='image' align='middle' src='images/list_home.png' title='"._("Go to users department")."'
alt='"._("Home")."' name='dep_home'> ".
+ " <input class='center' type='image' src='images/list_reload.png' align='middle' title='"._("Reload list")."' name='submit_department' alt='"._("Submit")."'> ".
" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
" <input class='center' type='image' align='middle' src='images/list_new_ogroup.png' title='"._("Create new object group")."' alt='"._("new")."' name='group_new'>".
+ $Copy_Paste.
" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
- _("Current base")." <select name='depselect' onChange='mainform.submit()'>$options</select>".
+ _("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
" <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
"</div>";
- $actions = "<input type='image' src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
- $actions.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+ /* Add Copy & Paste buttons if copy&paste is enabled
+ */
+ if($this->enableCopyPaste){
+ $actions = "<input class='center' type='image'
+ src='images/editcut.png' alt='"._("cut")."' name='cut_%KEY%' title='"._("Cut this entry")."'> ";
+ $actions.= "<input class='center' type='image'
+ src='images/editcopy.png' alt='"._("copy")."' name='copy_%KEY%' title='"._("Copy this entry")."'> ";
+ $actions.= "<input class='center' type='image'
+ src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+ $actions.= "<input class='center' type='image'
+ src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+ }else{
+ $actions = "<input class='center' type='image'
+ src='images/edit.png' alt='"._("edit")."' name='group_edit_%KEY%' title='"._("Edit this entry")."'>";
+ $actions.= "<input class='center' type='image'
+ src='images/edittrash.png' alt='"._("delete")."' name='group_del_%KEY%' title='"._("Delete this entry")."'>";
+ }
+
// Defining Links
$linkopen = "<a href='?plug=".$_GET['plug']."&act=dep_open&dep_id=%s'>%s</a>";
// image Buttons
$editlink = "<a href='?plug=".$_GET['plug']."&id=%s&act=edit_entry'>%s</a>";
- $userimg = "<img src='images/select_groups.png' alt='User' title='%s'>";
+ $userimg = "<img class='center' src='images/select_groups.png' alt='User' title='%s'>";
// Extension images
- $mailimg = "<img src='images/mailto.png' alt='M' title='"._("Mail") ."'>";
+ $mailimg = "<img class='center' src='images/mailto.png' alt='M' title='"._("Mail") ."'>";
// Space
- $empty = "<img src='images/empty.png' style='width:16px;height:16px;' alt=''>";
+ $empty = "<img class='center' src='images/empty.png' style='width:16px;height:16px;' alt=''>";
// List Setup
$divlist = new divlist("ogroubstab");
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:60px;border-right:0px;text-align:right;'")
+ array("string" => _("Actions"), "attach" => "style='width:80;border-right:0px;text-align:right;'")
));
$field1 = array("string" => "<img src='images/".$non_empty."folder.png' alt='"._("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:60px;border-right:0px;text-align:right;'");
+ $field4 = array("string" => " ", "attach" => "style='width:80;border-right:0px;text-align:right;'");
$divlist->AddEntry(array($field1,$field2,$field3,$field4));
}
$mail = $empty;
}
- $title = "title='dn : ".$val['dn']."'";
+ $title = "title='dn: ".@LDAP::fix($val['dn'])."'";
if(!isset($val['description'][0])){
$desc = "";
}
$field1 = array("string" => "<img src='images/list_ogroup.png' alt='"._("Object group")."' ".$title.">", "attach" => "style='text-align:center;width:20px;'");
$field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
- $field3 = array("string" => $this->convert_list($val)." ".$mail, "attach" => "style='width:136px;'");
- $field4 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+ $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));
}
$smarty->assign("groups", $divlist->DrawList());
foreach( array("usergroups", "groupgroups", "appgroups", "depgroups",
- "servergroups", "wsgroups", "prtgroups", "tcgroups", "fongroups", "regex", "depselect") as $type){
+ "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());
$conv= array(
- "U" => array("select_user.png",_("User")),
- "G" => array("select_groups.png",_("Group")),
- "A" => array("select_application.png",_("Application")),
- "D" => array("select_department.png",_("Department")),
- "S" => array("select_server.png",_("Server")),
- "F" => array("select_phone.png",_("Phone")),
- "W" => array("select_workstation.png",_("Workstation")),
- "T" => array("select_terminal.png",_("Terminal")),
- "P" => array("select_printer.png",_("Printer")));
+ "U" => array("select_user.png" ,_("User") , "ogroup"),
+ "G" => array("select_groups.png" ,_("Group") , "ogroup"),
+ "A" => array("select_application.png" ,_("Application") , "ogroup"),
+ "D" => array("select_department.png" ,_("Department") , "ogroup"),
+ "S" => array("select_server.png" ,_("Server") , "ogroup"),
+ "F" => array("select_phone.png" ,_("Phone") , "phonequeue"),
+ "W" => array("select_workstation.png" ,_("Workstation") , "workstartup"),
+ "T" => array("select_terminal.png" ,_("Terminal") , "termgroup"),
+ "P" => array("select_printer.png" ,_("Printer") , "ogroup"));
/* Assemble picture */
$type= $input['gosaGroupObjects'][0];
$p1['pic']= $conv[$type[0]][0];
$p1['tit']= $conv[$type[0]][1];
$p1['alt']= $type[0];
+ $p1['lnk']= $conv[$type[0]][2];
} else {
$p1['pic']= "empty.png";
$p1['tit']= "";
$p1['alt']= "";
+ $p1['lnk']= "";//$conv[$type[0]][2];
}
+
if (isset($type[1])){
$p2['pic']= $conv[$type[1]][0];
$p2['alt']= $type[1];
$p2['tit']= $conv[$type[1]][1];
+ $p2['lnk']= $conv[$type[1]][2];
} else {
$p2['pic']= "empty.png";
$p2['alt']= "";
$p2['tit']= "";
+ $p2['lnk']= ""; //$conv[$type[0]][2];
}
- $temp = "<img src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
- $temp.= "<img src='images/".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
+ $temp = "<input type='image' name='".$p1['lnk']."_group_edit_%KEY' class='center'
+ src='images/".$p1['pic']."' alt='".$p1['alt']."' title='".$p1['tit']."'>";
+ $temp.= "<input type='image' name='".$p2['lnk']."_group_edit_%KEY'class='center'
+ src='images/".$p2['pic']."' alt='".$p2['alt']."' title='".$p2['tit']."'>";
return ($temp);
}
$ogroupfilter= get_global('ogroupfilter');
/* Set base for all searches */
- $base= $ogroupfilter['depselect'];
+ $base= $_SESSION['CurrentMainBase'];
/* Regex filter? */
if ($ogroupfilter['regex'] != ""){
$filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames))";
}
- $groups = ($this->config->current['GROUPS']);
-
- $res= get_list($this->ui->subtreeACL, "$filter",FALSE, $groups.",".$base, array("*"), TRUE);
+ $res= get_list($filter, $this->ui->subtreeACL, get_groups_ou().$base, array("*"), GL_SIZELIMIT );
$this->ogrouplist= $res;
ksort ($this->ogrouplist);
reset ($this->ogrouplist);
* We also need to search for the departments
* So we are able to navigate like in konquerer
*/
- $base2 = preg_replace("/ou=people,/i","",$base);
+ $peopleOU = get_people_ou();
- $res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
- TRUE, $base2, array("ou", "description"), TRUE);
+ 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();
- $tmp = array();
- foreach ($res3 as $value){
- $tmp[strtolower($value['dn']).$value['dn']]=$value;
- }
- ksort($tmp);
- foreach($tmp as $value){
- if(isset($value["description"][0])){
- $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+ $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']]=convert_department_dn2($value['dn']);//$value["description"][0];
+ $this->departments[$value['dn']]= get_sub_department($value['dn']);
}
}
- /* END NEW LIST MANAGMENT
- */
+ natcasesort($this->departments);
$tmp=array();
foreach($this->ogrouplist as $tkey => $val ){
$this->ogrouplist[]=$val;
}
reset ($this->ogrouplist);
-
-
-
}
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: