From fd458609809972a0cdc7d910bf1d968f6c54fc3d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Oct 2006 21:58:58 +0000
Subject: [PATCH] ability to set an email-address for groups (with automatic
 forwards to member's email)

---
 admin/inc/class.boaccounts.inc.php     | 6 ++++--
 admin/inc/class.uiaccounts.inc.php     | 7 +++++++
 admin/templates/default/group_form.tpl | 7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index e87f337a12..1c3e868b9f 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -208,8 +208,9 @@
 				'account_firstname' => $group_info['account_name'],
 				'account_lastname'  => 'Group',
 				'account_status'    => 'A',
-				'account_expires'   => -1
+				'account_expires'   => -1,
 //				'account_file_space' => $account_file_space_number . "-" . $account_file_space_type,
+				'account_email' => $_POST['account_email'],
 			);
 			$group_info['account_id'] = $group->create($account_info);
 			// do the following only if we got an id - the create succided
@@ -361,7 +362,7 @@
 				'account_id'   => ($_POST['account_id']?(int)$_POST['account_id']:0),
 				'account_name' => ($_POST['account_name']?$_POST['account_name']:''),
 				'account_user' => $_POST['account_user'],
-				'account_apps' => $account_apps
+				'account_apps' => $account_apps,
 			);
 			$this->validate_group($group_info);
 
@@ -412,6 +413,7 @@
 
 			// This is down here so we are sure to catch the acl changes
 			// for LDAP to update the memberuid attribute
+			$group->data['account_email'] = $_POST['account_email'];
 			$group->save_repository();
 			
 			$GLOBALS['hook_values'] = $group_info;
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index fbcdd3cc08..6bfb72659b 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -969,6 +969,13 @@
 			$p->set_var ('account_file_space_select','<select name="account_file_space_type">'."\n".$account_file_space_select.'</select>'."\n");
 	*/
 
+			if ($group_repository['mailAllowed'])
+			{
+				$p->set_var(array(
+					'lang_email' => lang('Email'),
+					'email' => $GLOBALS['egw']->html->input('account_email',$group_repository['account_email'],'',' style="width: 100%;"'),
+				));
+			}
 			reset($GLOBALS['egw_info']['apps']);
 			$sorted_apps = $GLOBALS['egw_info']['apps'];
 			@asort($sorted_apps);
diff --git a/admin/templates/default/group_form.tpl b/admin/templates/default/group_form.tpl
index 8f1b49c3bf..298361b39e 100644
--- a/admin/templates/default/group_form.tpl
+++ b/admin/templates/default/group_form.tpl
@@ -1,5 +1,5 @@
   {error}
-  <table border="0" width="50%" align="center">
+  <table border="0" width="60%" align="center">
    <tr>
     <td valign="top">
      {rows}
@@ -20,6 +20,11 @@
          {accounts}
         </td>
        </tr>
+       
+       <tr>
+        <td>{lang_email}</td>
+        <td>{email}</td>
+      </tr>
 
        <tr>
         <td>{lang_file_space}</td>