Fixed post handling.

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

diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
index 68c21fe472712f66f58d235217ccb39f868d3231..51ee3f218abd821bcac22fe0236f3024c0c19840 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
@@ -22,188 +22,188 @@
 
 class DaemonEvent_notify extends DaemonEvent
 {
-  var $visible_for = USER_EVENT;
+    var $visible_for = USER_EVENT;
 
-  var $user = array();
-  var $group= array(); 
+    var $user = array();
+    var $group= array(); 
 
-  var $message = "";
-  var $subject = "";
-  var $from    = "";
+    var $message = "";
+    var $subject = "";
+    var $from    = "";
 
-  var $attributes = array("from","user","group","message","subject");
+    var $attributes = array("from","user","group","message","subject");
 
-  public function __construct($config,$data = array())
-  {
-    DaemonEvent::__construct($config,$data);
+    public function __construct($config,$data = array())
+    {
+        DaemonEvent::__construct($config,$data);
 
-    $ui = get_userinfo();
-    $this->from = $ui->cn; 
- 
-    $this->message = base64_decode($this->message);
-    $this->subject = base64_decode($this->subject);
+        $ui = get_userinfo();
+        $this->from = $ui->cn; 
 
-    $this->s_Menu_Name  = _("Send message");
-    $this->s_Event_Name = _("Send message");
+        $this->message = base64_decode($this->message);
+        $this->subject = base64_decode($this->subject);
 
-    $this->s_Schedule_Action = "job_send_user_msg";
-    $this->s_Trigger_Action= "gosa_send_user_msg";
-    $this->s_Queued_Action= "trigger_action_notify";
-    $this->s_Menu_Image = "plugins/goto/images/notify.png";
-    $this->s_List_Image = "plugins/goto/images/notify.png";
-    $this->a_targets = array("GOSA"); // Required to get the event send. Maybe this is a wrong value.
-  }
+        $this->s_Menu_Name  = _("Send message");
+        $this->s_Event_Name = _("Send message");
 
-  public function execute()
-  {
-    DaemonEvent::execute();
-
-    /* Check if target add dialog is open */
-    if($this->is_target_list_open() && $this->is_new){
-      return($this->get_target_add_list());
+        $this->s_Schedule_Action = "job_send_user_msg";
+        $this->s_Trigger_Action= "gosa_send_user_msg";
+        $this->s_Queued_Action= "trigger_action_notify";
+        $this->s_Menu_Image = "plugins/goto/images/notify.png";
+        $this->s_List_Image = "plugins/goto/images/notify.png";
+        $this->a_targets = array("GOSA"); // Required to get the event send. Maybe this is a wrong value.
     }
 
+    public function execute()
+    {
+        DaemonEvent::execute();
 
-    $display = $this->get_header();
-    $tmp = $this->data;
-    $smarty = get_smarty();
-    $smarty->assign("data"        , $this->data);
-    $smarty->assign("is_new"      , $this->is_new);
-    $smarty->assign("timestamp"   , $this->get_time_select());
-    
-    $smarty->assign("user" , $this->user);
-    $smarty->assign("group" , $this->group);
-    
-    $smarty->assign("add_str", msgPool::addButton(_("Target")));
-    $smarty->assign("del_str", msgPool::delButton(_("Target")));
-
-    $smarty->assign("from",    xmlentities($this->from));
-    $smarty->assign("subject", xmlentities($this->subject));
-    $smarty->assign("message", xmlentities($this->message));
-
-    $display.= $smarty->fetch(get_template_path('DaemonEvent_notify.tpl', TRUE, dirname(__FILE__)));
-    $display.= $this->get_footer();
-    return($display);
-  }
-
-
-  public function check()
-  {
-    $msgs = DaemonEvent::check();
-    if(empty($this->subject)){
-      $msgs[] = msgPool::required(_("Subject"));
-    }
-    if(empty($this->message)){
-      $msgs[] = msgPool::required(_("Message"));
-    }
-    if(empty($this->from)){
-      $msgs[] = msgPool::required(_("From"));
+        /* Check if target add dialog is open */
+        if($this->is_target_list_open() && $this->is_new){
+            return($this->get_target_add_list());
+        }
+
+
+        $display = $this->get_header();
+        $tmp = $this->data;
+        $smarty = get_smarty();
+        $smarty->assign("data"        , $this->data);
+        $smarty->assign("is_new"      , $this->is_new);
+        $smarty->assign("timestamp"   , $this->get_time_select());
+
+        $smarty->assign("user" , $this->user);
+        $smarty->assign("group", $this->group);
+
+        $smarty->assign("add_str", msgPool::addButton(_("Target")));
+        $smarty->assign("del_str", msgPool::delButton(_("Target")));
+
+        $smarty->assign("from",    set_post($this->from));
+        $smarty->assign("subject", set_post($this->subject));
+        $smarty->assign("message", set_post($this->message));
+
+        $display.= $smarty->fetch(get_template_path('DaemonEvent_notify.tpl', TRUE, dirname(__FILE__)));
+        $display.= $this->get_footer();
+        return($display);
     }
-    if(!count($this->group) && !count($this->user)){
-      $msgs[] = msgPool::required(_("Target"));
+
+
+    public function check()
+    {
+        $msgs = DaemonEvent::check();
+        if(empty($this->subject)){
+            $msgs[] = msgPool::required(_("Subject"));
+        }
+        if(empty($this->message)){
+            $msgs[] = msgPool::required(_("Message"));
+        }
+        if(empty($this->from)){
+            $msgs[] = msgPool::required(_("From"));
+        }
+        if(!count($this->group) && !count($this->user)){
+            $msgs[] = msgPool::required(_("Target"));
+        }
+        return($msgs);
     }
-    return($msgs);
-  }
 
 
-  public function save_object()
-  {
-    DaemonEvent::save_object();
+    public function save_object()
+    {
+        DaemonEvent::save_object();
 
-    if(isset($_POST['del_any_target']) && isset($_POST['group'])){
-      foreach($_POST['group'] as $id){
-        if(isset($this->group[$id])){
-          unset($this->group[$id]);
+        if(isset($_POST['del_any_target']) && isset($_POST['group'])){
+            foreach($_POST['group'] as $id){
+                if(isset($this->group[$id])){
+                    unset($this->group[$id]);
+                }
+            }
         }
-      }
-    }
-    if(isset($_POST['del_any_target']) && isset($_POST['user'])){
-      foreach($_POST['user'] as $id){
-        if(isset($this->user[$id])){
-          unset($this->user[$id]);
+        if(isset($_POST['del_any_target']) && isset($_POST['user'])){
+            foreach($_POST['user'] as $id){
+                if(isset($this->user[$id])){
+                    unset($this->user[$id]);
+                }
+            }
         }
-      }
-    }
 
-    if(isset($_POST['subject'])){
-      $this->subject = get_post('subject');
-    }
-    if(isset($_POST['message'])){
-      $this->message = get_post('message');
-    }
-    if(isset($_POST['from'])){
-      $this->from = get_post('from');
+        if(isset($_POST['subject'])){
+            $this->subject = get_post('subject');
+        }
+        if(isset($_POST['message'])){
+            $this->message = get_post('message');
+        }
+        if(isset($_POST['from'])){
+            $this->from = get_post('from');
+        }
     }
-  }
 
-  public function add_users($targets)
-  {
-    $add = $targets;
-    if(!is_array($add)){
-      $add = array($add);
-    }
-    foreach($add as $target){
-      if(!in_array($target,$this->user)){
-        $this->user[] = $target;
-      }
+    public function add_users($targets)
+    {
+        $add = $targets;
+        if(!is_array($add)){
+            $add = array($add);
+        }
+        foreach($add as $target){
+            if(!in_array($target,$this->user)){
+                $this->user[] = $target;
+            }
+        }
     }
-  }
 
 
-  public function add_groups($targets)
-  {
-    $add = $targets;
-    if(!is_array($add)){
-      $add = array($add);
-    }
-    foreach($add as $target){
-      if(!in_array($target,$this->group)){
-        $this->group[] = $target;
-      }
+    public function add_groups($targets)
+    {
+        $add = $targets;
+        if(!is_array($add)){
+            $add = array($add);
+        }
+        foreach($add as $target){
+            if(!in_array($target,$this->group)){
+                $this->group[] = $target;
+            }
+        }
     }
-  }
 
 
-  /*! \brief  Returns HTML content, displaying a dialog which allows to add new targets.
-    @return String HTML content. (EventAddSystemDialog)
-   */
-  public function get_target_add_list()
-  {
-    $this->target_add_list_used = TRUE;
+    /*! \brief  Returns HTML content, displaying a dialog which allows to add new targets.
+      @return String HTML content. (EventAddSystemDialog)
+     */
+    public function get_target_add_list()
+    {
+        $this->target_add_list_used = TRUE;
 
-    if($this->target_listing == NULL){
-      $this->target_listing = new EventAddUserDialog($this->config,$this);
+        if($this->target_listing == NULL){
+            $this->target_listing = new EventAddUserDialog($this->config,$this);
+        }
+        $smarty = get_smarty();
+        $smarty->assign("listing",$this->target_listing->execute());
+        return($smarty->fetch(get_template_path('target_list.tpl', TRUE, dirname(__FILE__))));
     }
-    $smarty = get_smarty();
-    $smarty->assign("listing",$this->target_listing->execute());
-    return($smarty->fetch(get_template_path('target_list.tpl', TRUE, dirname(__FILE__))));
-  }
 
 
-  /*! \brief Add a target MAC address
+    /*! \brief Add a target MAC address
       @param Array A List of all target that should be added.
-   */
-  public function add_targets($targets)
-  {
-    if(isset($targets['USERS'])){
-      $this->add_users($targets['USERS']);
+     */
+    public function add_targets($targets)
+    {
+        if(isset($targets['USERS'])){
+            $this->add_users($targets['USERS']);
+        }
+        if(isset($targets['GROUPS'])){
+            $this->add_groups($targets['GROUPS']);
+        }
     }
-    if(isset($targets['GROUPS'])){
-      $this->add_groups($targets['GROUPS']);
+
+
+    public function save()
+    {
+        $ret = DaemonEvent::save();
+        $ret['delivery_time'] = $ret['timestamp'];
+        $ret['user']   = array_values( $ret['user']);
+        $ret['group']  = array_values( $ret['group']);
+        $ret['subject'] = base64_encode($ret['subject']);
+        $ret['message'] = base64_encode($ret['message']);
+        return($ret);
     }
-  }
-
-
-  public function save()
-  {
-    $ret = DaemonEvent::save();
-    $ret['delivery_time'] = $ret['timestamp'];
-    $ret['user']   = array_values( $ret['user']);
-    $ret['group']  = array_values( $ret['group']);
-    $ret['subject'] = base64_encode($ret['subject']);
-    $ret['message'] = base64_encode($ret['message']);
-    return($ret);
-  }
 } 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>