From bef4c77916f1ccc4484ebbb40ded0d3fc75782c7 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 17 May 2006 04:37:01 +0000 Subject: [PATCH] Added Marco divlist git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3370 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/gofon/macro/class_divListMacros.inc | 145 +++++++ .../macro/class_gofonMacroManagement.inc | 387 ++++-------------- plugins/gofon/macro/main.inc | 9 +- 3 files changed, 240 insertions(+), 301 deletions(-) create mode 100755 plugins/gofon/macro/class_divListMacros.inc diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc new file mode 100755 index 000000000..c549e9cab --- /dev/null +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -0,0 +1,145 @@ +parent = $parent; + $this->ui = get_userinfo(); + + /* Set list strings */ + $this->SetTitle(_("List of macros")); + $this->SetSummary(_("List of macros")); + + /* Result page will look like a headpage */ + $this->SetHeadpageMode(); + $this->SetInformation(_("This menu allows you to add, edit and remove selected macros. ". + "You may want to use the range selector on top of the macro listbox, ". + "when working with a large number of macros.")); + + $this->EnableAplhabet (true); + + /* Disable buttonsm */ + $this->EnableCloseButton(false); + $this->EnableSaveButton (false); + + /* set Page header */ + $this->AddHeader(array("string" => " ", "attach" => "style='text-align:center;width:20px;'")); + $this->AddHeader(array("string" => _("Username")." / "._("Department"), "attach" => "style=''")); + $this->AddHeader(array("string" => _("Visible"), "attach" => "style='width:50px;'")); + $this->AddHeader(array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" )); + + /* Add Checkboxes / SubSearch checkbox */ + $this->AddCheckBox("SubSearch", _("Select to search within subtrees"), _("Ignore subtrees"), false); + + /* Name ,Text ,Default , Connect with alphabet */ + $this->AddRegex ("Regex", _("Regular expression for matching macro names"),"*" , true); + } + + function GenHeader() + { + /* Prepare departments, + which are shown in the listbox on top of the listbox + */ + $options= ""; + foreach ($this->config->idepartments as $key => $value){ + if ($this->selectedBase == $key){ + $options.= ""; + } else { + $options.= ""; + } + } + + /* NEW LIST MANAGMENT */ + $listhead = "
". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + _("Base")." ". + "  ". + "
"; + + $this->SetListHeader($listhead); + } + + function execute() + { + $this->ClearElementsList(); + $this->GenHeader(); + } + + function setEntries($list) + { + + $action = ""; + $action .= ""; + + $empty = ""; + $macroimg = ""._("Macro").""; + $visible = ""._("yes").""; + $invisible = ""._("no").""; + $editlink = "%s"; + + foreach($list as $key => $val){ + $display= $val["displayName"][0]; + + if(isset($val['goFonMacroVisible']['0'])&&($val['goFonMacroVisible']['0'] == "1")){ + $pic1 = $visible; + }else{ + $pic1 = $invisible; + } + + $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); + $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='dn: ".@LDAP::fix($val['dn'])."'"); + $field3 = array("string" => $pic1, "attach" => "style='width:50px;'"); + $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'"); + + $this->AddElement(array($field1,$field2,$field3,$field4)); + } + } + + function Save() + { + MultiSelectWindow :: Save(); + } + + function save_object() + { + /* Save automatic created POSTs like regex, checkboxes */ + MultiSelectWindow :: save_object(); + } +} +// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: +?> diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc index 131ae83c6..cb28c7e13 100755 --- a/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -22,14 +22,15 @@ require "tabs_macros.inc"; class gofonMacro extends plugin { /* Definitions */ - var $plHeadline = "Phone macros"; - var $plDescription = "This does something"; + var $plHeadline = "Phone macros"; + var $plDescription = "This does something"; /* Dialog attributes */ - var $macrotabs = NULL; - var $macros = array(); - var $ui = NULL; - var $acl = ""; + var $macrotabs = NULL; + var $macros = array(); + var $ui = NULL; + var $acl = ""; + var $DivListMacro = NULL; function gofonMacro($config, $ui) { @@ -37,52 +38,30 @@ class gofonMacro extends plugin $this->config= $config; $this->ui= $ui; - /* Get global filter config */ - if (!is_global("macrofilter")){ - $base= get_base_from_people($ui->dn); - $macrofilter= array("regex" => "*"); - register_global("macrofilter", $macrofilter); - } - - if(!isset($_SESSION['CurrentMainBase'])){ - $_SESSION['CurrentMainBase'] = $base= get_base_from_people($ui->dn); - } - $acl= get_permissions ($ui->dn, $ui->subtreeACL); $this->acl= get_module_permission($acl, "goFonMacro", $ui->dn); + + $this->DivListMacro = new divListMacro($this->config,$this); } function execute() { - /* Call parent execute */ - plugin::execute(); - - /* Save data */ - $macrofilter= get_global("macrofilter"); - foreach( array("regex") as $type){ - if (isset($_POST[$type])){ - $macrofilter[$type]= $_POST[$type]; - } - } - if (isset($_GET['search'])){ - $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*"; - if ($s == "**"){ - $s= "*"; - } - $macrofilter['regex']= $s; - } + /* Call parent execute */ + plugin::execute(); + + /***************** + Variable initialisation + *****************/ $s_action = ""; // Contains the action to proceed $s_entry = ""; // The value for s_action $base_back = ""; // The Link for Backbutton + $smarty= get_smarty(); - /* 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)]; - } + /***************** + Check Posts + *****************/ /* Test Posts */ foreach($_POST as $key => $val){ @@ -95,63 +74,23 @@ class gofonMacro extends plugin $s_action="edit"; $s_entry = preg_replace("/user_".$s_action."_/i","",$key); // Post for new - }elseif(preg_match("/dep_back.*/i",$key)){ - $s_action="back"; }elseif(preg_match("/user_new.*/",$key)){ $s_action="new"; - }elseif(preg_match("/dep_home.*/i",$key)){ - $s_action="home"; }elseif(preg_match("/user_chgpw.*/i",$key)){ $s_action="change_pw"; $s_entry = preg_replace("/user_chgpw_/i","",$key); - }elseif(preg_match("/dep_root.*/i",$key)){ - $s_action="root"; } } - if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){ + if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){ $s_action ="edit"; $s_entry = $_GET['id']; } - $s_entry = preg_replace("/_.$/","",$s_entry); - /* Department changed? */ - if(isset($_POST['CurrentMainBase']) && $_POST['CurrentMainBase']){ - $_SESSION['CurrentMainBase']= $_POST['CurrentMainBase']; - } - - /* Homebutton is posted */ - if($s_action=="home"){ - $_SESSION['CurrentMainBase'] = preg_replace("/^[^,]+,/","",$this->ui->dn); - $_SESSION['CurrentMainBase'] = preg_replace("/^[^,]+,/","", $_SESSION['CurrentMainBase']); - } - - if($s_action=="root"){ - $_SESSION['CurrentMainBase'] = $this->config->current['BASE'] ; - } - - - /* 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("macrofilter", $macrofilter); - $this->reload(); - - $smarty= get_smarty(); - /* Check for exeeded sizelimit */ - if (($message= check_sizelimit()) != ""){ - return($message); - } + /***************** + Create a new Macro + *****************/ /* New macro? */ if ($s_action=="new"){ @@ -164,14 +103,24 @@ class gofonMacro extends plugin $this->macrotabs= new macrotabs($this->config,$this->config->data['TABS']['MACROTABS'], $this->dn); } + + /***************** + Edit || Password canceled + *****************/ + /* Cancel dialogs */ - if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){ + if (isset($_POST['edit_cancel']) || isset($_POST['delete_cancel'])){ del_lock ($this->macrotabs->dn); unset ($this->macrotabs); $this->macrotabs= NULL; unset ($_SESSION['objectinfo']); } + + /***************** + Edit finised + *****************/ + /* Finish mac edit is triggered by the tabulator dialog, so the user wants to save edited data. Check and save at this point. */ @@ -195,9 +144,6 @@ class gofonMacro extends plugin del_lock ($this->dn); } - /* There's no page reload so we have to read new mac at - this point. */ - $this->reload (); unset ($this->macrotabs); $this->macrotabs= NULL; unset ($_SESSION['objectinfo']); @@ -208,7 +154,12 @@ class gofonMacro extends plugin } } - /* User wants to edit data? */ + + /***************** + Edit macro + *****************/ + + /* User wants to edit data */ if (($s_action=="edit") && (!isset($this->macrotabs->config))){ /* Get 'dn' from posted 'macrolists', must be unique */ @@ -225,10 +176,15 @@ class gofonMacro extends plugin add_lock ($this->dn, $this->ui->dn); /* Register macrotabs to trigger edit dialog */ $this->macrotabs= new macrotabs($this->config, - $this->config->data['TABS']['MACROTABS'], $this->dn); + $this->config->data['TABS']['MACROTABS'], $this->dn); $_SESSION['objectinfo']= $this->dn; } + + /***************** + Remove marco + *****************/ + /* Remove user was requested */ if ($s_action=="del"){ @@ -260,24 +216,26 @@ class gofonMacro extends plugin } } - /* Confirmation for deletion has been passed. Group should be deleted. */ + + /***************** + Remove macro + *****************/ + + /* Confirmation for deletion has been passed. Macro should be deleted. */ if (isset($_POST['delete_macro_confirm'])){ /* Some nice guy may send this as POST, so we've to check for the permissions again. */ if (chkacl($this->acl, "delete") == ""){ - + /* Delete request is permitted, perform LDAP action */ $this->macrotabs= new macrotabs($this->config,$this->config->data['TABS']['MACROTABS'], $this->dn); $this->macrotabs->set_acl(array($this->acl)); - + $this->macrotabs->delete (); gosa_log ("macro object'".$this->dn."' has been removed"); unset ($this->macrotabs); $this->macrotabs= NULL; - - /* Group list has changed, reload it. */ - $this->reload (); } else { /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ @@ -289,11 +247,9 @@ class gofonMacro extends plugin } - /* Delete macro canceled? */ - if (isset($_POST['delete_cancel'])){ - del_lock ($this->dn); - unset($_SESSION['objectinfo']); - } + /***************** + Display open dialogs + *****************/ /* Show tab dialog if object is present */ if (($this->macrotabs) && (isset($this->macrotabs->config))){ @@ -311,180 +267,46 @@ class gofonMacro extends plugin } + /***************** + Display entry list + *****************/ + /* Return rendered main page */ + /* Display dialog with system list */ + $this->DivListMacro->execute(); - /* Prepare departments */ - $options= ""; - foreach ($this->config->idepartments as $key => $value){ - if ($_SESSION['CurrentMainBase'] == $key){ - $options.= ""; - } else { - $options.= ""; - } - } - - - /* NEW LIST MANAGMENT */ - $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - _("Base")." ". - "  ". - "
"; - - - /* Options */ - $action= ""; - $action.= ""; - - $divlist = new divlist("macrotabs"); - $divlist->SetHeader(array( - array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), - array("string" => _("Username")." / "._("Department"), "attach" => "style=''"), - array("string" => _("Visible"), "attach" => "style='width:50px;'"), - array("string" => _("Actions"), "attach" => "style='width:60px;border-right:0px;text-align:right;'" ))); - - - $divlist->SetSummary(_("This table displays all phone macros, in the selected tree.")); - $divlist->SetEntriesPerPage(0); - - // Defining Links - $linkopen = "%s"; - - 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:50px;'"); - $field4 = array("string" => " ", "attach" => "style='width:60px;border-right:0px;text-align:right;'"); - $divlist->AddEntry(array($field1,$field2,$field3,$field4)); - } - - // Pictures for Extensions - $empty = ""; - - // User and Template Images - $macroimg = ""._("Macro").""; - $visible = ""._("yes").""; - $invisible = ""._("no").""; - - // Link for edit - $editlink = "%s"; - - // Test Every Entry and generate divlist Array - foreach($this->macros as $key => $val){ - // Generate Array to Add - $display= $val["displayName"][0]; - - - if(isset($val['goFonMacroVisible']['0'])&&($val['goFonMacroVisible']['0'] == "1")){ - $pic1 = $visible; - }else{ - $pic1 = $invisible; - } - - $field1 = array("string" => sprintf($macroimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'"); - $field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='dn: ".@LDAP::fix($val['dn'])."'"); - $field3 = array("string" => $pic1, "attach" => "style='width:50px;'"); - $field4 = array("string" => preg_replace("/%KEY%/", "$key", $action), "attach" => "style='width:60px;border-right:0px;text-align:right;'"); - - $divlist->AddEntry(array($field1,$field2,$field3,$field4)); - } - - /* Show main page */ - $smarty->assign("macroshead", $listhead); - $smarty->assign("macros", $divlist->DrawList()); - $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); - foreach( array("regex") as $type){ - $smarty->assign("$type", $macrofilter[$type]); + /* Add departments if subsearch is disabled */ + if(!$this->DivListMacro->SubSearch){ + $this->DivListMacro->AddDepartments($this->DivListMacro->selectedBase,4); } - - $smarty->assign("CurrentMainBase" , $_SESSION['CurrentMainBase']); - - /* Extend if we are not using javascript */ - $smarty->assign("apply", apply_filter()); - $smarty->assign("alphabet", generate_alphabet()); - $smarty->assign("hint", print_sizelimit_warning()); - - return($smarty->fetch(get_template_path('headpage.tpl', TRUE))); + $this->reload(); + $this->DivListMacro->setEntries($this->macros); + return($this->DivListMacro->Draw()); } function reload() { - /* Get config */ - $macrofilter= get_global('macrofilter'); - /* Set base for all searches */ - $base= $_SESSION['CurrentMainBase']; - - /* Regex filter? */ - if ($macrofilter['regex'] != ""){ - $regex= $macrofilter['regex']; - } else { - $regex= "*"; - } - - /* Generate macro list */ - $res= get_list("(&(cn=$regex)(objectClass=goFonMacro))", $this->ui->subtreeACL, - "ou=macros,ou=asterisk,ou=configs,ou=systems,".$base, array("*"), GL_SIZELIMIT); - $this->macros= $res; - - /* 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; + $base = $this->DivListMacro->selectedBase; + $SubSearch = $this->DivListMacro->SubSearch; + $Regex = $this->DivListMacro->Regex; + $Filter = "(&(cn=".$Regex.")(objectClass=goFonMacro))"; + $Flags = GL_SIZELIMIT; + $Attrs = array("cn","description","displayName"); + + /* Prepare for ls or search*/ + if($SubSearch){ + $Flags |= GL_SUBSEARCH; }else{ - $base2 = preg_replace("/".$peopleOU."/i","",$base); - } - - $res3= 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']]= get_sub_department($value['dn'])." - [".$value["description"][0]."]"; - }else{ - $this->departments[$value['dn']]= get_sub_department($value['dn']);//$value["description"][0]; - } + $base = "ou=macros,ou=asterisk,ou=configs,ou=systems,".$base; } - /* END NEW LIST MANAGMENT - */ + /* Generate macro list */ + $res= get_list($Filter, $this->ui->subtreeACL,$base, $Attrs, $Flags); - $tmp=array(); - foreach($this->macros as $tkey => $val ){ + $tmp=array(); + foreach($res as $tkey => $val ){ $tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val; } ksort($tmp); @@ -496,51 +318,16 @@ class gofonMacro extends plugin reset ($this->macros); } - function remove_from_parent() - { - /* Optionally execute a command after we're done */ - $this->postremove(); - } - /* Save data to object */ function save_object() { + $this->DivListMacro->save_object(); } - /* Check values */ - function check() - { - } - - - /* Save to LDAP */ - function save() - { - /* Optionally execute a command after we're done */ - $this->postcreate(); - } - - function adapt_from_template($dn) - { - } - - function password_change_needed() - { - } - - function show_header($button_text, $text, $disabled= FALSE) - { - } - - function remove_lock() - { - if (isset($this->macrotabs->dn)){ - del_lock ($this->macrotabs->dn); - } - } - + function adapt_from_template($dn) { } + function check() { } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/plugins/gofon/macro/main.inc b/plugins/gofon/macro/main.inc index a5d88b776..f35e23b6f 100755 --- a/plugins/gofon/macro/main.inc +++ b/plugins/gofon/macro/main.inc @@ -26,16 +26,23 @@ if ($remove_lock){ sess_del ('macroManagment'); } } else { + /* Create macroManagment object on demand */ if (!isset($_SESSION['macroManagment']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ $_SESSION['macroManagment']= new goFonMacro ($config, $_SESSION['ui']); } + + /* Get object */ $macroManagment= $_SESSION['macroManagment']; + $macroManagment->save_object(); $output= $macroManagment->execute(); /* Page header*/ if (isset($_SESSION['objectinfo'])){ - $display= print_header(get_template_path('images/macros.png'), _("Phone macro management"), "\"\" ".@LDAP::fix($_SESSION['objectinfo'])); + $display= print_header( get_template_path('images/macros.png'), + _("Phone macro management"), + "\"\" + ".@LDAP::fix($_SESSION['objectinfo'])); } else { $display= print_header(get_template_path('images/macros.png'), _("Phone macro management")); } -- 2.30.2