Updated post handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19224 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/mail/admin/ogroups/mail/class_mailogroup.inc b/gosa-plugins/mail/admin/ogroups/mail/class_mailogroup.inc
index e626b07807b51a8c75eafa4f11b600ad16c06c29..780f4f932a727988387af1b7454736641f441edf 100644 (file)
--- a/gosa-plugins/mail/admin/ogroups/mail/class_mailogroup.inc
+++ b/gosa-plugins/mail/admin/ogroups/mail/class_mailogroup.inc
@@ -2,198 +2,198 @@
 
 class mailogroup extends plugin
 {
-  /* plugin specific values */
-  var $mail= "";
-  var $cn= "";
+    /* plugin specific values */
+    var $mail= "";
+    var $cn= "";
 
-  /* attribute list for save action */
-  var $attributes= array("mail");
-  var $objectclasses= array("kolabGroupOfNames");
-  var $members= array();
-  var $view_logged = FALSE;
+    /* attribute list for save action */
+    var $attributes= array("mail");
+    var $objectclasses= array("kolabGroupOfNames");
+    var $members= array();
+    var $view_logged = FALSE;
 
-  function mailogroup (&$config, $dn= NULL, $parent= NULL)
-  {
-    plugin::plugin($config, $dn, $parent);
+    function mailogroup (&$config, $dn= NULL, $parent= NULL)
+    {
+        plugin::plugin($config, $dn, $parent);
 
-    /* Include config object */
-    $this->config= $config;
+        /* Include config object */
+        $this->config= $config;
 
-    /* Save initial account state */
-    $this->initially_was_account= $this->is_account;
-  }
-
-
-  function execute()
-  {
-    /* Call parent execute */
-    plugin::execute();
-
-    if($this->is_account && !$this->view_logged){
-      $this->view_logged = TRUE;
-      new log("view","ogroups/".get_class($this),$this->dn);
+        /* Save initial account state */
+        $this->initially_was_account= $this->is_account;
     }
 
 
-    /* Do we need to flip is_account state? */
-    if(isset($_POST['modify_state'])){
-      if($this->is_account && $this->acl_is_removeable()){
-        $this->is_account= FALSE;
-      }elseif(!$this->is_account && $this->acl_is_createable()){
-        $this->is_account= TRUE;
-      }
+    function execute()
+    {
+        /* Call parent execute */
+        plugin::execute();
+
+        if($this->is_account && !$this->view_logged){
+            $this->view_logged = TRUE;
+            new log("view","ogroups/".get_class($this),$this->dn);
+        }
+
+
+        /* Do we need to flip is_account state? */
+        if(isset($_POST['modify_state'])){
+            if($this->is_account && $this->acl_is_removeable()){
+                $this->is_account= FALSE;
+            }elseif(!$this->is_account && $this->acl_is_createable()){
+                $this->is_account= TRUE;
+            }
+        }
+
+        /* Show tab dialog headers */
+        if ($this->parent !== NULL){
+            if ($this->is_account){
+                $display= $this->show_disable_header(_("Remove mail account"),
+                        msgPool::featuresEnabled(_("mail group")));
+            } else {
+                $display= $this->show_enable_header(_("Create mail account"), 
+                        msgPool::featuresDisabled(_("mail group")));
+                return ($display);
+            }
+        }
+
+        /* Initialize templating engine */
+        $smarty= get_smarty();
+
+        $tmp = $this->plInfo();
+        foreach($tmp['plProvidedAcls'] as $name => $translation){
+            $smarty->assign($name."ACL",$this->getacl("mail"));
+        }
+
+        /* Assign mail attribute */
+        $smarty->assign("mail", set_post($this->mail));
+
+        /* Show main page */
+        return ($display.$smarty->fetch (get_template_path('mail.tpl', TRUE,dirname(__FILE__))));
     }
 
-    /* Show tab dialog headers */
-    if ($this->parent !== NULL){
-      if ($this->is_account){
-        $display= $this->show_disable_header(_("Remove mail account"),
-            msgPool::featuresEnabled(_("mail group")));
-      } else {
-        $display= $this->show_enable_header(_("Create mail account"), 
-            msgPool::featuresDisabled(_("mail group")));
-        return ($display);
-      }
-    }
-    
-    /* Initialize templating engine */
-    $smarty= get_smarty();
 
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $name => $translation){
-      $smarty->assign($name."ACL",$this->getacl("mail"));
-    }
-
-    /* Assign mail attribute */
-    $smarty->assign("mail", $this->mail);
+    /* Check formular input */
+    function check()
+    {
+        /* Call common method to give check the hook */
+        $message= plugin::check();
 
-    /* Show main page */
-    return ($display.$smarty->fetch (get_template_path('mail.tpl', TRUE,dirname(__FILE__))));
-  }
+        if ($this->is_account){
+            $ldap= $this->config->get_ldap_link();
 
+            /* Check if mail address is valid */
+            if (!tests::is_email($this->mail) || $this->mail == ""){
+                $message[]= msgPool::invalid(_("Mail address"),"","",_("your-name@your-domain.com"));
+            }
 
-  /* Check formular input */
-  function check()
-  {
-    /* Call common method to give check the hook */
-    $message= plugin::check();
+            /* Check if mail address is already in use */
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->search ("(&(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".$this->mail."))(!(cn=".$this->cn.")))", array("uid"));
+            if ($ldap->count() != 0){
+                $message[]= msgPool::duplicated(_("Mail address"));
+            }
+        }
 
-    if ($this->is_account){
-      $ldap= $this->config->get_ldap_link();
+        return ($message);
+    }
 
-      /* Check if mail address is valid */
-      if (!tests::is_email($this->mail) || $this->mail == ""){
-        $message[]= msgPool::invalid(_("Mail address"),"","",_("your-name@your-domain.com"));
-      }
 
-      /* Check if mail address is already in use */
-      $ldap->cd($this->config->current['BASE']);
-      $ldap->search ("(&(!(objectClass=gosaUserTemplate))(|(mail=".$this->mail.")(gosaMailAlternateAddress=".$this->mail."))(!(cn=".$this->cn.")))", array("uid"));
-      if ($ldap->count() != 0){
-        $message[]= msgPool::duplicated(_("Mail address"));
-      }
+    function save()
+    {
+        $ldap= $this->config->get_ldap_link();
+
+        /* Call parents save to prepare $this->attrs */
+        plugin::save();
+
+        /* Save data to LDAP */
+        $ldap->cd($this->dn);
+        $this->cleanup();
+        $ldap->modify ($this->attrs); 
+
+        if($this->initially_was_account){
+            new log("modify","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }else{
+            new log("create","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }
+
+        if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+        }
+
+        /* Optionally execute a command after we're done */
+        if ($this->initially_was_account == $this->is_account){
+            if ($this->is_modified){
+                $this->handle_post_events("modify");
+            }
+        } else {
+            $this->handle_post_events("add");
+        }
     }
 
-    return ($message);
-  }
 
+    /* remove object from parent */
+    function remove_from_parent()
+    {
+        /* Cancel if there's nothing to do here */
+        if (!$this->initially_was_account){
+            return;
+        }
 
-  function save()
-  {
-    $ldap= $this->config->get_ldap_link();
+        /* include global link_info */
+        $ldap= $this->config->get_ldap_link();
 
-    /* Call parents save to prepare $this->attrs */
-    plugin::save();
+        /* Remove and write to LDAP */
+        plugin::remove_from_parent();
 
-    /* Save data to LDAP */
-    $ldap->cd($this->dn);
-    $this->cleanup();
-    $ldap->modify ($this->attrs); 
+        @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
+                $this->attributes, "Save");
+        $ldap->cd($this->dn);
+        $this->cleanup();
+        $ldap->modify ($this->attrs); 
 
-    if($this->initially_was_account){
-      new log("modify","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-    }else{
-      new log("create","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-    }
-
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
-    }
+        new log("remove","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
 
-    /* Optionally execute a command after we're done */
-    if ($this->initially_was_account == $this->is_account){
-      if ($this->is_modified){
-        $this->handle_post_events("modify");
-      }
-    } else {
-      $this->handle_post_events("add");
+        if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
+        }
     }
-  }
 
 
-  /* remove object from parent */
-  function remove_from_parent()
-  {
-    /* Cancel if there's nothing to do here */
-    if (!$this->initially_was_account){
-      return;
+    function getCopyDialog()
+    {
+        $str = "";
+        $smarty = get_smarty();
+        $smarty->assign("mail", set_post($this->mail));
+        $str = $smarty->fetch(get_template_path("paste_mail.tpl",TRUE,dirname(__FILE__)));
+        $ret = array();
+        $ret['string'] = $str;
+        $ret['status'] = "";
+        return($ret);
     }
 
-    /* include global link_info */
-    $ldap= $this->config->get_ldap_link();
 
-    /* Remove and write to LDAP */
-    plugin::remove_from_parent();
-
-    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
-        $this->attributes, "Save");
-    $ldap->cd($this->dn);
-    $this->cleanup();
-    $ldap->modify ($this->attrs); 
+    function saveCopyDialog()
+    {
+        if(isset($_POST['mail'])){
+            $this->mail = get_post('mail');
+        }
+    }
 
-    new log("remove","ogroups/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
 
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_MOD, get_class()));
-    }
-  }
-
-
-  function getCopyDialog()
-  {
-    $str = "";
-    $smarty = get_smarty();
-    $smarty->assign("mail",     $this->mail);
-    $str = $smarty->fetch(get_template_path("paste_mail.tpl",TRUE,dirname(__FILE__)));
-    $ret = array();
-    $ret['string'] = $str;
-    $ret['status'] = "";
-    return($ret);
-  }
-
-
-  function saveCopyDialog()
-  {
-    if(isset($_POST['mail'])){
-      $this->mail = $_POST['mail'];
+    static function plInfo()
+    {
+        return (array(
+                    "plShortName"   => _("Mail"),
+                    "plDescription" => _("Mail group"),
+                    "plSelfModify"  => FALSE,
+                    "plDepends"     => array(),
+                    "plPriority"    => 4,
+                    "plSection"     => array("administration"),
+                    "plCategory"    => array("ogroups"),
+                    "plProvidedAcls"=> array(
+                        "mail" => _("Mail address"))
+                    ));
     }
-  }
-
-
-   static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("Mail"),
-          "plDescription" => _("Mail group"),
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 4,
-          "plSection"     => array("administration"),
-          "plCategory"    => array("ogroups"),
-          "plProvidedAcls"=> array(
-            "mail" => _("Mail address"))
-          ));
-  }