diff -urN ../vmailadmin-2.0_RC5.orig/styles/gris/templates/admin/users_modifylist.html ./styles/gris/templates/admin/users_modifylist.html
--- ../vmailadmin-2.0_RC5.orig/styles/gris/templates/admin/users_modifylist.html 2006-11-15 06:20:43.000000000 +0200
+++ ./styles/gris/templates/admin/users_modifylist.html 2007-06-10 23:02:59.000000000 +0300
@@ -25,6 +25,7 @@
|
{display_users.user_loop.MAILBOX}
+ ({display_users.user_loop.NAME})
|
@@ -39,10 +40,12 @@
|
+
|
diff -urN ../vmailadmin-2.0_RC5.orig/styles/gris/templates/user_base.html ./styles/gris/templates/user_base.html
--- ../vmailadmin-2.0_RC5.orig/styles/gris/templates/user_base.html 2006-11-14 04:19:20.000000000 +0200
+++ ./styles/gris/templates/user_base.html 2007-01-28 17:38:56.000000000 +0200
@@ -66,8 +66,22 @@
{forwarding.L_ADDRESSEXPLAIN}-
-
+
+
+
+
+
+
{forwarding.L_FORWARDSAVEEXPLAIN}-
+
+
+ {L_YES}
+ {L_NO}
+
diff -urN ../vmailadmin-2.0_RC5.orig/users/user/index.php ./users/user/index.php
--- ../vmailadmin-2.0_RC5.orig/users/user/index.php 2006-11-17 08:00:33.000000000 +0200
+++ ./users/user/index.php 2007-01-28 17:15:47.000000000 +0200
@@ -40,7 +40,9 @@
'user_lang' => 'user_lang',
'forward_destination' => 'destination',
'forwarding' => 'forwarding',
+ 'forwarding_save' => 'forwarding_save',
'prev_destination' => 'prev_destination',
+ 'hidden_destination' => 'hidden_destination',
'style_id' => 'style_id',
'items_per_page' => 'items_per_page'
);
diff -urN ../vmailadmin-2.0_RC5.orig/users/user/user_base.php ./users/user/user_base.php
--- ../vmailadmin-2.0_RC5.orig/users/user/user_base.php 2006-11-14 04:22:25.000000000 +0200
+++ ./users/user/user_base.php 2007-01-28 17:00:59.000000000 +0200
@@ -107,6 +107,7 @@
if ( $domaindata['permit_mail_forwarding'] || $user->data['user_level'] == ADMIN || $user->data['user_level'] == ROOT )
{
+ $forwarding['destination'] = '';
if ( $user->data['forwarding'] )
{
$sql = sprintf("SELECT %s
@@ -120,12 +121,16 @@
report_error(CRITICAL_MESSAGE,'Error 2520: '.sprintf(_('Unable to query: %s'),ALIAS_TABLE),$sql,__FILE__,__LINE__);
}
$row = $db->sql_fetchrow($result);
- $destination = $row['destination'];
+ $destination = $row[ALIAS_DESTINATION];
+ $forwarding['destination'] = $row['destination'];
}
- $forwarding['destination'] = $row['destination'];
- if ( empty($row['destination']) )
+ if ( empty($forwarding['destination']) )
{
+ $forwarding['destination'] = $user->data['forward_dest'];
+ }
+ if ( empty($forwarding['destination']) )
+ {
$forwarding['destination'] = "... email@domain.tld ...";
}
@@ -134,9 +139,13 @@
'L_FORWARDEXPLAIN' => _('To enable mail forwarding, you must also provide the address to forward to below.'),
'L_ADDRESS' => _('Forwarding Address'),
'L_ADDRESSEXPLAIN' => _('Forwarding address must be in the format of user@domain.tld'),
+ 'L_FORWARDSAVE' => _('Save Forwarded Message'),
+ 'L_FORWARDSAVEEXPLAIN' => _('Retain a local copy of forwarded mail.'),
'INPUTSTATE' => !$user->data['forwarding'] ? 'disabled="disabled"' : NULL,
'FORWARDYES' => $user->data['forwarding'] ? 'checked="checked"' : NULL,
'FORWARDNO' => !$user->data['forwarding'] ? 'checked="checked"' : NULL,
+ 'FORWARDSAVEYES' => $user->data['forward_save'] ? 'checked="checked"' : NULL,
+ 'FORWARDSAVENO' => !$user->data['forward_save'] ? 'checked="checked"' : NULL,
'ADDRESS' => $forwarding['destination'])
);
}
diff -urN ../vmailadmin-2.0_RC5.orig/users/user/user_update.php ./users/user/user_update.php
--- ../vmailadmin-2.0_RC5.orig/users/user/user_update.php 2006-11-10 10:39:10.000000000 +0200
+++ ./users/user/user_update.php 2007-06-10 20:37:21.000000000 +0300
@@ -45,9 +45,10 @@
$change_password = TRUE;
}
+$forward_state = $forwarding ? ENABLE : DISABLE;
+$forward_save_state = $forwarding_save ? ENABLE : DISABLE;
if ( !($forwarding == $user->data['forwarding']) || !($forward_destination == $prev_destination) )
{
- $forward_state = $forwarding ? ENABLE : DISABLE;
if ( $forward_state == ENABLE )
{
if ( $forward_destination{0} == "." || !check_email($forward_destination) )
@@ -57,13 +58,14 @@
}
}
- ratify_user_mail_forwarding($user->data,$forward_state,$forward_destination);
+ ratify_user_mail_forwarding($user->data,$forward_state,$forward_destination,$forward_save_state);
}
+if (!$forward_destination ) $forward_destination = $hidden_destination;
$sql = sprintf("UPDATE %s
- SET %s name = '%s', user_lang = '%s', modified = '%d', items_per_page = '%d', forwarding = '%d', style_id = '%d'
+ SET %s name = '%s', user_lang = '%s', modified = '%d', items_per_page = '%d', forwarding = '%d', forward_save = '%d', forward_dest = '%s', style_id = '%d'
WHERE user_id = '%d'",
- USERS_TABLE,$update_password,$name,$user_lang,$config['current_time'],$items_per_page,$forward_state,$style_id,$user->data['user_id']);
+ USERS_TABLE,$update_password,$name,$user_lang,$config['current_time'],$items_per_page,$forward_state,$forward_save_state,$forward_destination,$style_id,$user->data['user_id']);
if ( !($result = $db->sql_query($sql)) )
{
|