From 992205ceca64ce8347ca9bafe0c860bc62a2b4e7 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 23 Jun 2005 12:52:45 +0000 Subject: [PATCH] nothing important git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@814 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/gofon/macro/class_gofonMacro.inc | 22 ++++++++-- .../macro/class_gofonMacroParameters.inc | 9 ++++- plugins/gofon/macro/main.inc | 40 +++++++++---------- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc index 81f676686..5aa085b11 100755 --- a/plugins/gofon/macro/class_gofonMacro.inc +++ b/plugins/gofon/macro/class_gofonMacro.inc @@ -18,6 +18,10 @@ class macro extends plugin var $attributes= array("cn","base", "description","displayName","goFonMacroContent","goFonMacroVisible"); var $objectclasses= array("top", "goFonMacro"); + + /*! + Konstructor, load class with attributes of the given dn + */ function macro ($config, $dn= NULL) { plugin::plugin ($config, $dn); @@ -38,6 +42,9 @@ class macro extends plugin } } + /*! + Execute this plugin + */ function execute() { /* Variables */ @@ -84,6 +91,9 @@ class macro extends plugin return($smarty->fetch (get_template_path('generic.tpl', TRUE))); } + /*! + Remove this Object + */ function remove_from_parent() { $ldap= $this->config->get_ldap_link(); @@ -103,7 +113,9 @@ class macro extends plugin } - /* Save data to object */ + /*! + Save data to object + */ function save_object() { if (isset($_POST['cn'])){ @@ -113,7 +125,9 @@ class macro extends plugin } - /* Check values */ + /*! + Check values + */ function check() { $message = array(); @@ -140,7 +154,9 @@ class macro extends plugin } - /* Save to LDAP */ + /*! + Save to LDAP + */ function save() { /* Post checks */ diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc index 3aaa420f3..1dfc84c3a 100755 --- a/plugins/gofon/macro/class_gofonMacroParameters.inc +++ b/plugins/gofon/macro/class_gofonMacroParameters.inc @@ -18,7 +18,9 @@ class macroParameter extends plugin var $attributes= array("base","goFonMacroParameter"); var $objectclasses= array("top", "goFonMacro"); - + /*! + Konstructor + */ function macroParameter ($config, $dn= NULL) { plugin::plugin ($config, $dn); @@ -74,6 +76,9 @@ class macroParameter extends plugin $this->goFonMacroParameter = $tmp2; } + /*! + Check given parameters from content and from object and compare them + */ function check_paras($content,$goFonMacroParameter) { /* Check contents for parameters */ @@ -174,7 +179,7 @@ class macroParameter extends plugin /* Sort by Parameterid, and keep keys */ ksort($FonParas); - + foreach($FonParas as $key=>$para) { /* Select correct item of combobox */ diff --git a/plugins/gofon/macro/main.inc b/plugins/gofon/macro/main.inc index 31e0fdf42..03f80a8e1 100755 --- a/plugins/gofon/macro/main.inc +++ b/plugins/gofon/macro/main.inc @@ -1,30 +1,30 @@ remove_lock(); - del_lock ($ui->dn); - sess_del ('macroManagment'); - } + if(isset($_SESSION['macroManagement'])){ + $macroManagment= $_SESSION['macroManagment']; + $macroManagment->remove_lock(); + del_lock ($ui->dn); + sess_del ('macroManagment'); + } } else { /* Create macroManagment object on demand */ if (!isset($_SESSION['macroManagment']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ -- 2.30.2