X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fgofon%2Fmacro%2Fclass_gofonMacroManagement.inc;h=f494bc828a40af5f4f97467cbd40d61542d53036;hb=e51a29e05df3b0c0976a722d7bd3d11af70f1794;hp=78bf955287276074a021b1f00799d25a0d8f4e00;hpb=42f59c2850b5cbd42863e29957911542af81414f;p=gosa.git
diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index 78bf95528..f494bc828 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,47 +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("depselect" => $base, "regex" => "*");
- register_global("macrofilter", $macrofilter);
- }
-
$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("depselect", "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']);
- $macrofilter['depselect']= "".$this->config->departments[trim($s_entry)];
- }
+
+ /*****************
+ Check Posts
+ *****************/
/* Test Posts */
foreach($_POST as $key => $val){
@@ -90,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['depselect']) && $_POST['depselect']){
- $macrofilter['depselect']= $_POST['depselect'];
- }
-
- /* Homebutton is posted */
- if($s_action=="home"){
- $macrofilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
- $macrofilter['depselect']=(preg_replace("/^[^,]+,/","",$macrofilter['depselect']));
- }
-
- if($s_action=="root"){
- $macrofilter['depselect']=($this->config->current['BASE']);
- }
-
-
- /* If Backbutton is Posted */
- if($s_action=="back"){
- $base_back = preg_replace("/^[^,]+,/","",$macrofilter['depselect']);
- $base_back = convert_department_dn($base_back);
-
- if(isset($this->config->departments[trim($base_back)])){
- $macrofilter['depselect']= $this->config->departments[trim($base_back)];
- }else{
- $macrofilter['depselect']= $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"){
@@ -159,18 +103,28 @@ 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. */
- if (isset($_POST['edit_finish'])){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->macrotabs->config))){
/* Check tabs, will feed message array */
$this->macrotabs->last= $this->macrotabs->current;
@@ -184,18 +138,17 @@ class gofonMacro extends plugin
$this->macrotabs->save();
gosa_log ("Macro object'".$this->dn."' has been saved");
- /* macro has been saved successfully, remove lock from
- LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
- }
+ if (!isset($_POST['edit_apply'])){
+ /* macro has been saved successfully, remove lock from
+ LDAP. */
+ if ($this->dn != "new"){
+ 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']);
+ unset ($this->macrotabs);
+ $this->macrotabs= NULL;
+ unset ($_SESSION['objectinfo']);
+ }
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
@@ -203,8 +156,13 @@ class gofonMacro extends plugin
}
}
- /* User wants to edit data? */
- if ($s_action=="edit"){
+
+ /*****************
+ Edit macro
+ *****************/
+
+ /* User wants to edit data */
+ if (($s_action=="edit") && (!isset($this->macrotabs->config))){
/* Get 'dn' from posted 'macrolists', must be unique */
$this->dn= $this->macros[$s_entry]['dn'];
@@ -220,10 +178,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"){
@@ -255,24 +218,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 */
@@ -284,21 +249,23 @@ 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){
+ if (($this->macrotabs) && (isset($this->macrotabs->config))){
$display= $this->macrotabs->execute();
/* Don't show buttons if tab dialog requests this */
if (!$this->macrotabs->by_object[$this->macrotabs->current]->dialog){
$display.= "\n";
- $display.= "\n";
+ $display.= "\n";
$display.= " \n";
+ if ($this->dn != "new"){
+ $display.= "\n";
+ $display.= " \n";
+ }
$display.= "\n";
$display.= "
";
}
@@ -306,176 +273,47 @@ class gofonMacro extends plugin
}
+ /*****************
+ Display entry list
+ *****************/
+ /* Return rendered main page */
+ /* Display dialog with system list */
+ $this->DivListMacro->parent = $this;
+ $this->DivListMacro->execute();
- /* Prepare departments */
- $options= "";
- foreach ($this->config->idepartments as $key => $value){
- if ($macrofilter['depselect'] == $key){
- $options.= "";
- } else {
- $options.= "";
- }
+ /* Add departments if subsearch is disabled */
+ if(!$this->DivListMacro->SubSearch){
+ $this->DivListMacro->AddDepartments($this->DivListMacro->selectedBase,4);
}
-
-
- /* NEW LIST MANAGMENT */
- $listhead = "";
-
-
- /* 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](images/".$non_empty."folder.png)
", "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 = "
";
- $visible = "
";
- $invisible = "
";
-
- // 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='".$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("depselect", "regex") as $type){
- $smarty->assign("$type", $macrofilter[$type]);
- }
-
- /* 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= $macrofilter['depselect'];
-
- /* Regex filter? */
- if ($macrofilter['regex'] != ""){
- $regex= $macrofilter['regex'];
- } else {
- $regex= "*";
- }
-
- /* Generate macro list */
- $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)(objectClass=goFonMacro))", FALSE, "ou=macros,ou=asterisk,ou=configs,ou=systems,".$base, array("*"), TRUE);
- $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","goFonMacroVisible");
+
+ /* Prepare for ls or search*/
+ if($SubSearch){
+ $Flags |= GL_SUBSEARCH;
}else{
- $base2 = preg_replace("/".$peopleOU."/i","",$base);
+ $base = "ou=macros,ou=asterisk,ou=configs,ou=systems,".$base;
}
- $res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
- TRUE, $base2, array("ou", "description"), TRUE);
-
- $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]."]";
- }else{
- $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
- }
- }
-
- /* 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);
@@ -487,51 +325,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:
?>
".
- " ".
- "