X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fgofon%2Fmacro%2Fclass_gofonMacroManagement.inc;h=f494bc828a40af5f4f97467cbd40d61542d53036;hb=e51a29e05df3b0c0976a722d7bd3d11af70f1794;hp=53281d0c52557c9ef27e7c34719db2d748cca24d;hpb=721c5fa0836cba0f00488aaeaa6e0cd8f48385ea;p=gosa.git diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc index 53281d0c5..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,41 +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() { - /* 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){ @@ -84,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"){ @@ -151,21 +101,30 @@ class gofonMacro extends plugin /* Create new usertab object */ $this->macrotabs= new macrotabs($this->config,$this->config->data['TABS']['MACROTABS'], $this->dn); - $this->macrotabs->set_acl(array(':all')); } + + /***************** + 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; @@ -179,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. */ @@ -198,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']; @@ -213,17 +176,17 @@ class gofonMacro extends plugin /* Lock the current entry, so everyone will get the above dialog */ add_lock ($this->dn, $this->ui->dn); - - /* Set up the users ACL's for this 'dn' */ - $acl= get_permissions ($this->dn, $this->ui->subtreeACL); - /* Register macrotabs to trigger edit dialog */ $this->macrotabs= new macrotabs($this->config, $this->config->data['TABS']['MACROTABS'], $this->dn); - $this->macrotabs->set_acl($acl); $_SESSION['objectinfo']= $this->dn; } + + /***************** + Remove marco + *****************/ + /* Remove user was requested */ if ($s_action=="del"){ @@ -233,7 +196,7 @@ class gofonMacro extends plugin /* Load permissions for selected 'dn' and check if we're allowed to remove this 'dn' */ $acl= get_permissions ($this->dn, $this->ui->subtreeACL); - $this->acl= get_module_permission($acl, "macro", $this->dn); + $this->acl= get_module_permission($acl, "goFonMacro", $this->dn); if (chkacl($this->acl, "delete") == ""){ /* Check locking, save current plugin in 'back_plugin', so @@ -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,221 +249,92 @@ 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"; - $display.= "\n"; + if ($this->dn != "new"){ + $display.= "\n"; + $display.= " \n"; + } + $display.= "\n"; $display.= "
"; } return ($display); } + /***************** + 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 = "