Updated event notofication

-Updated target add

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

diff --git a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
index 276b513f1eeb7bdeb63dff0b146be3ab99325373..1499e46fa1e7a1dd9328fef4f8ed5ef9c924b3e6 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
+++ b/gosa-plugins/goto/addons/goto/events/DaemonEvent_notify.tpl
@@ -46,7 +46,7 @@
         </tr>
                <tr>
                        <td colspan="2">
-                               <input type="submit" name="add_any_target" value="{$add_str}">
+                               <input type="submit" name="open_target_list" value="{$add_str}">
                                <input type="submit" name="del_any_target" value="{$del_str}">
                        </td>
                </tr>

diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
index f1e2756cf62e4f3288cb9bba08f0dc11c294de88..47cdbf0f06405b254356362982c2776a8294e06d 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent.inc
@@ -463,22 +463,6 @@ class DaemonEvent
   }
 
 
-  /*! \brief  Returns a set of elements selected in a MultiSelectWindow
-    @return Array[integer]=integer
-   */
-  protected  function list_get_selected_items()
-  {
-    $ids = array();
-    foreach($_POST as $name => $value){
-      if(preg_match("/^item_selected_[0-9]*$/",$name)){
-        $id   = preg_replace("/^item_selected_/","",$name);
-        $ids[$id] = $id;
-      }
-    }
-    return($ids);
-  }
-
-
   /*! \brief Add a target MAC address 
       @param Array A List of all target that should be added.
    */

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 d37b7ecb80bb61263151c1ef375371537bb3e018..7295b6ac11ca78ff5dd9aaaf106f57d5fe8c4b7a 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_notify.inc
@@ -46,9 +46,13 @@ class DaemonEvent_notify extends DaemonEvent
   public function execute()
   {
     DaemonEvent::execute();
-    if(isset($_POST['add_any_target'])){
-      echo "Not implemented yet";  
+
+    /* 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();
@@ -118,14 +122,64 @@ class DaemonEvent_notify extends DaemonEvent
 
   public function add_users($targets)
   {
-    $this->users = $targets;
+    $add = $targets;
+    if(!is_array($add)){
+      $add = array($add);
+    }
+    foreach($add as $target){
+      if(!in_array($target,$this->users)){
+        $this->users[] = $target;
+      }
+    }
   }
 
+
   public function add_groups($targets)
   {
-    $this->groups = $targets;
+    $add = $targets;
+    if(!is_array($add)){
+      $add = array($add);
+    }
+    foreach($add as $target){
+      if(!in_array($target,$this->groups)){
+        $this->groups[] = $target;
+      }
+    }
   }
 
+
+  /*! \brief  Returns HTML content, displaying a dialog which allows to add new targets.
+    @return String HTML content. (EventTargetAddList)
+   */
+  public function get_target_add_list()
+  {
+    $this->target_add_list_used = TRUE;
+
+    if($this->target_divlist == NULL){
+      $this->target_divlist = new EventTargetAddUserList($this->config,$this);
+    }
+    $this->target_divlist->execute();
+
+    $smarty = get_smarty();
+    $smarty->assign("divlist",$this->target_divlist->Draw());
+    return($smarty->fetch(get_template_path('target_list.tpl', TRUE, dirname(__FILE__))));
+  }
+
+
+  /*! \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']);
+    }
+    if(isset($targets['GROUPS'])){
+      $this->add_groups($targets['GROUPS']);
+    }
+  }
+
+
   public function save()
   {
     $ret = DaemonEvent::save();

diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc
new file mode 100644 (file)
index 0000000..e4c93a6
--- /dev/null
+++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc
@@ -0,0 +1,220 @@
+<?php
+/*
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id: class_EventTargetAddUserList.inc 9597 2008-03-10 14:16:59Z hickert $$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+class EventTargetAddUserList extends MultiSelectWindow
+{
+  public $display_server = TRUE;
+  public $display_workstation = TRUE;
+  public $display_ogroup = TRUE;
+  public $filter_iprange = FALSE;
+
+  public $regex  = "*";
+  public $ipfrom = "0.0.0.0";
+  public $ipto   = "*";
+  public $_target_list = array();
+
+  function __construct(&$config,$parent)
+  {
+    MultiSelectWindow::MultiSelectWindow($config, "EventTargetAddUserList", 
+        array("users","groups"));
+
+    $this->parent       = $parent;
+    $this->ui           = get_userinfo();
+
+
+    $this->target_divlist = new MultiSelectWindow($this->config,"EventAddTargetUserList","gotomasses");
+    $this->SetSummary(_("Targets"));
+    $this->EnableCloseButton(FALSE);
+    $this->EnableSaveButton(FALSE);
+
+    $this->SetInformation(_("This dialog shows all available targets for your event, check the targets you want to add and use the 'Use' button to accept."));
+
+    /* Toggle all selected / deselected */
+    $chk = "<input type='checkbox' id='select_all' name='select_all'
+      onClick='toggle_all_(\"^item_selected_[0-9]*$\",\"select_all\");' >";
+
+    $this->EnableAplhabet(TRUE);
+
+    /* set Page header */
+    $this->AddHeader(array("string"=> $chk,          "attach"=>"style='width:20px;'"));
+    $this->AddHeader(array("string"=>"&nbsp;","attach"=>"style='width:20px;'"));
+    $this->AddHeader(array("string"=>_("System / Department")));
+
+    //$name,$string,$value,$conn,$image="images/search.png")
+    $this->AddRegex("regex" ,"regex"  ,"*"                , TRUE);
+
+    $this->AddCheckBox("display_users"  ,"1", _("Display users"),TRUE);
+    $this->AddCheckBox("display_groups" ,"1", _("Display groups"),TRUE);
+  }
+
+
+  function execute()
+  {
+    $this->ClearElementsList();
+    $this->AddDepartments($this->selectedBase,2,1);
+    $this->setEntries();
+    $this->GenHeader();
+  }
+
+
+  function GenHeader()
+  {
+    $modules = array("users","groups");
+
+    /* Add base */
+    $tmp = array();
+    $base = $this->config->current['BASE'];
+    $tmp[] = array("dn"=>$this->config->current['BASE']);
+    $tmp=  array_merge($tmp,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $modules, $base,
+          array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH));
+
+    $deps = array();
+    foreach($tmp as $tm){
+      $deps[$tm['dn']] = $tm['dn'];
+    }
+
+    $department = $departments = array();
+    $ui= get_userinfo();
+    $d = $ui->get_module_departments($modules);
+    foreach($d as $department){
+      $departments[$department] = $department;
+    }
+
+    /* Load possible departments */
+    $ids = $this->config->idepartments;
+    $first = "";
+    $found = FALSE;
+    $options = array();
+    foreach($ids as $dep => $name){
+      if(isset($deps[$dep]) && in_array_ics($dep, $departments)){
+
+        /* Keep first base dn in mind, we could need this
+         *  info if no valid base was found
+         */
+        if(empty($first)) {
+          $first = $dep['dn'];
+        }
+
+        $value = $ids[$dep];
+        if ($this->selectedBase == $dep){
+          $found = TRUE;
+          $options.= "<option selected='selected' value='".$dep."'>$value</option>";
+        } else {
+          $options.= "<option value='".$dep."'>$value</option>";
+        }
+      }
+    }
+
+    $listhead = $this->get_default_header();
+
+    /* Add base selection */
+    $listhead .= _("Base")."&nbsp; <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
+      " <input class='center' type='image' src='images/list_submit.png' align='middle'
+      title='"._("Submit department")."' name='submit_department' alt='". _("Submit")."'>&nbsp;";
+
+    $this->SetListHeader($listhead);
+
+  }
+
+
+  function setEntries()
+  {
+    $_target_list = array();
+
+    if($this->display_users){
+      $_target_list = array_merge($_target_list,
+          get_sub_list("(&(objectClass=person)(objectClass=gosaAccount))","users",get_people_ou(),get_people_ou().$this->selectedBase,
+          array("cn","objectClass","description","uid"),GL_NONE));
+    }
+    if($this->display_groups){
+      $_target_list = array_merge($_target_list,
+          get_sub_list("(objectClass=posixGroup)","groups",get_groups_ou(),get_groups_ou().$this->selectedBase,
+            array("cn","objectClass","description"),GL_NONE));
+    }
+    $this->_target_list = $_target_list;
+
+    $tmp = array();
+    foreach($this->_target_list as $key => $object){
+      $tmp[$key] = $object['cn'][0];
+    }
+    natcasesort($tmp);
+
+    foreach($tmp as $key => $obj){
+
+      $obj = $this->_target_list[$key];
+      $name = $obj['cn'][0];
+      if(isset($obj['description'])){
+        $name .= "&nbsp;[".$obj['description'][0]."]";
+      }
+
+      $img ="";
+      if(in_array("gosaAccount",$obj['objectClass'])){
+        $img = '<img class="center" src="images/select_user.png" alt="U" title="'._("User").'">';
+      }elseif(in_array("posixGroup",$obj['objectClass'])){
+        $img = '<img class="center" src="images/select_groups.png" alt="G" title="'._("Group").'">';
+      }
+
+      $field1 = array("string" => "<input type='checkbox' id='item_selected_".$key."' name='item_selected_".$key."'>",
+                      "attach" => "style='width:20px;'");
+      $field2 = array("string" => $img,
+                      "attach" => "style='width:20px;'");
+      $field3 = array("string" => $name , "attach" => "title='".$obj['dn']."'");
+      $this->AddElement(array($field1,$field2,$field3));
+    }
+  }
+
+
+  function get_selected_targets()
+  {
+    $a_targets = array("USERS" => array(),"GROUPS" => array());
+
+    foreach($this->list_get_selected_items() as $id){
+      $obj = $this->_target_list[$id];
+      if(in_array("posixGroup",$obj['objectClass'])){
+        $a_targets['GROUPS'][] = $obj['cn'][0];
+      }
+      if(in_array("gosaAccount",$obj['objectClass'])){
+        $a_targets['USERS'][] = $obj['uid'][0];
+      }
+    }
+
+    return($a_targets);
+  }
+
+
+  /*! \brief  Returns a set of elements selected in a MultiSelectWindow
+    @return Array[integer]=integer
+   */
+  protected  function list_get_selected_items()
+  {
+    $ids = array();
+    foreach($_POST as $name => $value){
+      if(preg_match("/^item_selected_[0-9]*$/",$name)){
+        $id   = preg_replace("/^item_selected_/","",$name);
+        $ids[$id] = $id;
+      }
+    }
+    return($ids);
+  }
+}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>