mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 16:29:22 +01:00
ability to set an email-address for groups (with automatic forwards to member's email)
This commit is contained in:
parent
5220740c17
commit
fd45860980
@ -208,8 +208,9 @@
|
|||||||
'account_firstname' => $group_info['account_name'],
|
'account_firstname' => $group_info['account_name'],
|
||||||
'account_lastname' => 'Group',
|
'account_lastname' => 'Group',
|
||||||
'account_status' => 'A',
|
'account_status' => 'A',
|
||||||
'account_expires' => -1
|
'account_expires' => -1,
|
||||||
// 'account_file_space' => $account_file_space_number . "-" . $account_file_space_type,
|
// 'account_file_space' => $account_file_space_number . "-" . $account_file_space_type,
|
||||||
|
'account_email' => $_POST['account_email'],
|
||||||
);
|
);
|
||||||
$group_info['account_id'] = $group->create($account_info);
|
$group_info['account_id'] = $group->create($account_info);
|
||||||
// do the following only if we got an id - the create succided
|
// 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_id' => ($_POST['account_id']?(int)$_POST['account_id']:0),
|
||||||
'account_name' => ($_POST['account_name']?$_POST['account_name']:''),
|
'account_name' => ($_POST['account_name']?$_POST['account_name']:''),
|
||||||
'account_user' => $_POST['account_user'],
|
'account_user' => $_POST['account_user'],
|
||||||
'account_apps' => $account_apps
|
'account_apps' => $account_apps,
|
||||||
);
|
);
|
||||||
$this->validate_group($group_info);
|
$this->validate_group($group_info);
|
||||||
|
|
||||||
@ -412,6 +413,7 @@
|
|||||||
|
|
||||||
// This is down here so we are sure to catch the acl changes
|
// This is down here so we are sure to catch the acl changes
|
||||||
// for LDAP to update the memberuid attribute
|
// for LDAP to update the memberuid attribute
|
||||||
|
$group->data['account_email'] = $_POST['account_email'];
|
||||||
$group->save_repository();
|
$group->save_repository();
|
||||||
|
|
||||||
$GLOBALS['hook_values'] = $group_info;
|
$GLOBALS['hook_values'] = $group_info;
|
||||||
|
@ -969,6 +969,13 @@
|
|||||||
$p->set_var ('account_file_space_select','<select name="account_file_space_type">'."\n".$account_file_space_select.'</select>'."\n");
|
$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']);
|
reset($GLOBALS['egw_info']['apps']);
|
||||||
$sorted_apps = $GLOBALS['egw_info']['apps'];
|
$sorted_apps = $GLOBALS['egw_info']['apps'];
|
||||||
@asort($sorted_apps);
|
@asort($sorted_apps);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{error}
|
{error}
|
||||||
<table border="0" width="50%" align="center">
|
<table border="0" width="60%" align="center">
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="top">
|
<td valign="top">
|
||||||
{rows}
|
{rows}
|
||||||
@ -20,6 +20,11 @@
|
|||||||
{accounts}
|
{accounts}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>{lang_email}</td>
|
||||||
|
<td>{email}</td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{lang_file_space}</td>
|
<td>{lang_file_space}</td>
|
||||||
|
Loading…
Reference in New Issue
Block a user