From 703bb19b0ee1eecc4a9501e7eb79932a3ccfe632 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Jun 2006 11:48:48 +0000
Subject: [PATCH] Added some kind of messaging plugin

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3961 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 contrib/gosa.conf                             |   6 +-
 html/images/notifications.png                 | Bin 0 -> 3972 bytes
 .../addons/notifications/class_msgplug.inc    | 229 ++++++++++++++++++
 plugins/addons/notifications/contents.tpl     |  76 ++++++
 plugins/addons/notifications/main.inc         |  47 ++++
 plugins/personal/mail/class_mailAccount.inc   |   5 +-
 6 files changed, 357 insertions(+), 6 deletions(-)
 create mode 100755 html/images/notifications.png
 create mode 100644 plugins/addons/notifications/class_msgplug.inc
 create mode 100644 plugins/addons/notifications/contents.tpl
 create mode 100644 plugins/addons/notifications/main.inc

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 01a127cf1..cf56c5681 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -40,8 +40,8 @@
 				icon="application.png" path="plugins/admin/applications" />
 			<plugin acl="systems" class="systems" icon="system.png"
 				path="plugins/admin/systems" />
-      <plugin acl="mimetype" class="mimetypeManagement"
-        icon="mimetypes.png" path="plugins/admin/mimetypes" />
+			<plugin acl="mimetype" class="mimetypeManagement"
+				icon="mimetypes.png" path="plugins/admin/mimetypes" />
 
 			<!-- Use 'lock_dn'      for dn
                      'lock_name'    for name
@@ -71,6 +71,8 @@
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
+			<plugin acl="notifications" class="msgplug" icon="notifications.png"
+                                path="plugins/addons/notifications" />
 		</section>
 	</menu>
 
diff --git a/html/images/notifications.png b/html/images/notifications.png
new file mode 100755
index 0000000000000000000000000000000000000000..e88e686623b7f6783a924ee65c30a7a3b0c5c865
GIT binary patch
literal 3972
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
bBY=;Y>D9OY+HGfy(ZJHhaZ$fUV8#Cf1vrEw

literal 0
HcmV?d00001

diff --git a/plugins/addons/notifications/class_msgplug.inc b/plugins/addons/notifications/class_msgplug.inc
new file mode 100644
index 000000000..4dffc2a77
--- /dev/null
+++ b/plugins/addons/notifications/class_msgplug.inc
@@ -0,0 +1,229 @@
+<?php
+
+class msgplug extends plugin
+{
+  /* Definitions */
+  var $plHeadline= "Notifications";
+  var $plDescription= "This does something";
+
+  /* attribute list for save action */
+  var $attributes= array("target", "nmessage");
+  var $objectclasses= array();
+
+  /* Helpers */
+  var $target= "group";
+  var $nmessage= "";
+
+  var $targets= array();
+  var $users= array();
+  var $groups= array();
+  var $recipients= array();
+  var $show_templates= false;
+  var $templates= array();
+  var $template= "";
+  var $finalized= false;
+
+
+  function msgplug ($config, $dn= NULL)
+  {
+    /* Include config object */
+    $this->config= $config;
+    $ui= get_userinfo();
+    $tag= $ui->gosaUnitTag;
+
+    /* Preset values */
+    $this->targets= array("user" => _("Users"), "group" => _("Groups"));
+    ksort($this->targets);
+
+    /* Users */
+    $ldap= $config->get_ldap_link();
+    $ldap->cd($config->current['BASE']);
+    if ($tag == ""){
+      $ldap->search('(objectClass=gosaAccount)', array('uid', 'cn'));
+    } else {
+      $ldap->search('(&(objectClass=gosaAccount)(gosaUnitTag)'.$tag.'))', array('uid', 'cn'));
+    }
+    while ($attrs= $ldap->fetch()){
+      $this->users['U:'.$attrs['uid'][0]]= $attrs['cn'][0].' ['.$attrs['uid'][0].']';
+    }
+    ksort($this->users);
+
+    /* Groups */
+    $ldap->cd($config->current['BASE']);
+    if ($tag == ""){
+      $ldap->search('(objectClass=posixGroup)', array('cn', 'description'));
+    } else {
+      $ldap->search('(&(objectClass=posixGroup)(gosaUnitTag='.$tag.'))', array('cn', 'description'));
+    }
+    while ($attrs= $ldap->fetch()){
+      $dsc= "";
+      if (isset($attrs['description'][0])){
+        $dsc= $attrs['description'][0];
+      }
+      $this->groups['G:'.$attrs['cn'][0]]= $attrs['cn'][0].' ['.$dsc.']';
+    }
+    ksort($this->groups);
+
+    /* Load templates */
+    if (isset($this->config->current['NOTIFYDIR'])){
+      $dir= $this->config->current['NOTIFYDIR'];
+      if (is_dir($dir) && is_readable($dir)){
+
+        /* Look for files and build the vacation array */
+        $dh= opendir($dir);
+        while ($file = readdir($dh)){
+          $description= $this->parse_notification("$dir/$file");
+          if ($description != ""){
+            $this->templates["$dir/$file"]= $description;
+          }
+        }
+        closedir($dh);
+      }
+
+      /* Enable templates if there are some... */
+      if (count($this->templates)){
+        $this->show_templates= true;
+      }
+    }
+  }
+
+
+  function execute()
+  {
+    /* Call parent execute */
+    plugin::execute();
+
+    /* Send message? */
+    if (isset($_POST['send'])){
+
+      /* Do we have recipients? */
+      if (count($this->recipients)){
+
+        /*Permissions ok? */
+        if (chkacl($this->acl, 'notify') != ""){
+          print_red(_("You have no permissions to send a message!"));
+        } else {
+          $cmd= search_config($this->config->data['MENU'], "msgplug", "NOTIFY_COMMAND");
+          if ($cmd == ""){
+            print_red(_("No NOTIFY_COMMAND definition found in your gosa.conf"));
+          } else {
+            $parameters= "";
+            foreach ($this->recipients as $key => $value){
+              $parameters.= "$key ";
+            }
+            exec ("$cmd $parameters", $dummy, $retval);
+            if ($retval != 0){
+              print_red(sprintf(_("Execution of '%s' failed!"), $cmd));
+            }
+            $this->finalized= true;
+          }
+        }
+      } else {
+        print_red(_("Please specify at least one recipient to send a message!"));
+      }
+    }
+
+    /* Bounce back to the original dialog */
+    if (isset($_POST['continue'])){
+      $this->finalized= false;
+    }
+
+    /* Add to list? */
+    if (isset($_POST['add']) && isset($_POST['source'])){
+      foreach ($_POST['source'] as $key){
+        if ($this->target == 'user'){
+          $this->recipients[$key]= $this->users[$key];
+        }
+        if ($this->target == 'group'){
+          $this->recipients[$key]= $this->groups[$key];
+        }
+      }
+      ksort($this->recipients);
+    }
+
+    /* Remove from list? */
+    if (isset($_POST['del']) && isset($_POST['recipient'])){
+      foreach ($_POST['recipient'] as $key){
+          unset($this->recipients[$key]);
+      }
+    }
+
+    /* Import message? */
+    if (isset($_POST["import_template"]) && isset($this->templates[$_POST["nmessage_template"]])){
+      $contents= "";
+      $lines= file($_POST["nmessage_template"]);
+      foreach ($lines as $line){
+        if (!preg_match('/^DESC:/', $line)){
+          $contents.= $line;
+        }
+      }
+
+      /* Replace attributes */
+      $ui= get_userinfo();
+      $contents= preg_replace('/%self/', $ui->cn, $contents);
+
+      /* Save message */
+      $this->nmessage= htmlspecialchars($contents);
+    }
+
+    $smarty= get_smarty();
+
+    /* Assign possible target types */
+    $smarty->assign("targets", $this->targets);
+    foreach ($this->attributes as $attr){
+      $smarty->assign($attr, $this->$attr);
+    }
+
+    /* Generate list */
+    $tmp= array();
+    foreach (array("user" => "users", "group" => "groups") as $field => $arr){
+      if ($this->target == $field){
+        foreach ($this->$arr as $key => $value){
+          if (!isset($this->recipients[$key])){
+            $tmp[$key]= $value;
+          }
+        }
+      }
+    }
+    $smarty->assign('sources', $tmp);
+    $smarty->assign('recipients', $this->recipients);
+
+    /* Assign ACL */
+    $smarty->assign('nmessageACL', chkacl($this->acl, "notify"));
+
+    /* Handle templates */
+    $smarty->assign('show_templates', $this->show_templates?"true":"false");
+    $smarty->assign('message_templates', $this->templates);
+    $smarty->assign('template', $this->template);
+    $smarty->assign('finished', $this->finalized?"true":"false");
+
+    /* Show main page */
+    return ($smarty->fetch (get_template_path('contents.tpl', TRUE)));
+  }
+
+
+  function parse_notification($file)
+  {
+    $desc= "";
+
+    if (is_file($file)){
+      $fh = fopen($file, "r");
+      $line= fgets($fh, 256);
+
+      if (!preg_match('/^DESC:/', $line)){
+        print_red (_("No DESC tag in message file:")." $file");
+        return $desc;
+      }
+      fclose ($fh);
+
+      $desc= trim(preg_replace('/^DESC:\s*/', '', $line));
+    }
+
+    return $desc;
+  }
+
+
+}
+
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
+?>
diff --git a/plugins/addons/notifications/contents.tpl b/plugins/addons/notifications/contents.tpl
new file mode 100644
index 000000000..a4d9d6882
--- /dev/null
+++ b/plugins/addons/notifications/contents.tpl
@@ -0,0 +1,76 @@
+{if $finished eq "false"}
+<h2>{t}Notification target{/t}</h2>
+
+<table style="width:100%">
+ <tr>
+  <td style="width:48%; vertical-align:top;">
+   {t}Use target from{/t}
+   <select name="target" onChange="document.mainform.submit()">
+        {html_options options=$targets selected=$target}
+        <option disabled>&nbsp;</option>
+   </select>
+   <input type="submit" value="{t}Apply{/t}" name="refresh"><br><br>
+  </td>
+  <td>
+  </td>
+  <td>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   {t}Available recipients{/t}<br>
+   <select style="width:100%;height:180px;" name="source[]" size="20" multiple title="{t}List message possible targets{/t}">
+            {html_options options=$sources}
+	    <option disabled>&nbsp;</option>
+   </select>
+  </td>
+  <td style="vertical-align:center; text-align:center">
+   <input type="submit" value="&gt;" name="add">
+   <br><br>
+   <input type="submit" value="&lt;" name="del">
+  </td>
+  <td style="width:48%; vertical-align:top;">
+   {t}Recipients{/t}<br>
+   <select style="width:100%;height:180px;" name="recipient[]" size="20" multiple title="{t}List message recipients{/t}">
+            {html_options options=$recipients}
+	    <option disabled>&nbsp;</option>
+   </select>
+  </td>
+ </tr>
+</table>
+
+
+<p class="seperator">&nbsp;</p>
+<h2>{t}Message{/t}</h2>
+
+<textarea id="nmessage" style="width:99%; height:180px;" name="nmessage" rows="4" cols="512" {$nmessageACL}>{$nmessage}</textarea>
+{if $show_templates eq "true"}
+<select name="nmessage_template">
+	{html_options options=$message_templates selected=$template}
+	<option disabled>&nbsp;</option>
+</select>
+<input type="submit" value="{t}Import{/t}" name="import_template">
+{/if}
+
+<p class="seperator">&nbsp;</p>
+<div style='text-align:right;margin-top:5px'>
+        <input type="submit" name="send" value="{t}Send message{/t}">
+</div>
+
+
+<!-- Place cursor -->
+<script language="JavaScript" type="text/javascript">
+  <!-- // First input field on page
+  document.mainform.nmessage.focus();
+  -->
+</script>
+{else}
+<h2>{t}Notification send!{/t}</h2>
+<p class="seperator">&nbsp;</p>
+<br>
+{t}Your message has been sent successfully. Press the continue button to get back to the notification plugin.{/t}
+<p class="seperator">&nbsp;</p>
+<div style='text-align:right;margin-top:5px'>
+        <input type="submit" name="continue" value="{t}Continue{/t}">
+</div>
+{/if}
diff --git a/plugins/addons/notifications/main.inc b/plugins/addons/notifications/main.inc
new file mode 100644
index 000000000..fe806b8b2
--- /dev/null
+++ b/plugins/addons/notifications/main.inc
@@ -0,0 +1,47 @@
+<?php
+/*
+  This code is part of GOsa (https://gosa.gonicus.de)
+  Copyright (C) 2005  Cajus Pollmeier
+
+  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
+*/
+
+if (!$remove_lock){
+	/* Create message object on demand */
+	if (!isset($_SESSION['msgplug']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){
+		$_SESSION['msgplug']= new msgplug ($config);
+	}
+	$msgplug= $_SESSION['msgplug'];
+
+	/* Set permissions */
+	$acl= get_permissions ($ui->dn, $ui->subtreeACL);
+	$msgplug->acl= get_module_permission($acl, "msgplug", $ui->dn);
+
+	/* save changes back to object */
+	if (isset ($_POST['target'])){
+	  $msgplug->save_object ();
+	}
+
+	/* Execute formular */
+	$display= $msgplug->execute ();
+	$display.= "<input type=\"hidden\" name=\"ignore\">\n";
+
+	/* Page header*/
+	$display= print_header(get_template_path('images/notifications.png'), _("Notifications")).$display;
+
+	/* Store changes  in session */
+	$_SESSION['msgplug']= $msgplug;
+}
+?>
diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index bff7beeb0..2ade42931 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -157,9 +157,6 @@ class mailAccount extends plugin
       }
     }
 
-
-    /* Get vacation message */
-
     /* Fill vacation array */
     $this->vacation= array();
     if (isset($this->config->current['VACATIONDIR'])){
@@ -379,7 +376,7 @@ class mailAccount extends plugin
     }
 
   
-    /* Vocation message */
+    /* Vacation message */
   
     /* Import vacation message? */
     if (isset($_POST["import_vacation"]) && isset($this->vacation[$_POST["vacation_template"]])){
-- 
2.30.2