--- postfixadmin_forward.php.original 2007-06-11 21:01:56.000000000 -0600
+++ postfixadmin_forward.php 2007-06-11 21:01:28.000000000 -0600
@@ -61,6 +61,7 @@
$USERID_USERNAME = $username;
$tmp = preg_split ('/@/', $USERID_USERNAME);
+$USERID_LOCALPART = $tmp[0];
$USERID_DOMAIN = $tmp[1];
// If the user is on vacation, we need to add/remove the autoreply domain (where appropriate) so the user
@@ -137,7 +138,7 @@
// if they're on vacation, add in the vacation alias
if($on_vacation)
{
- $goto = $USERID_USERNAME . '#' . $CONF['vacation_domain'] . ',' . $goto;
+ $goto = $USERID_LOCALPART . '#' . $USERID_DOMAIN . '@' . $CONF['vacation_domain'] . ',' . $goto;
}
$result = db_query ("UPDATE alias SET goto='" . db_escape($goto) . "',modified=NOW() WHERE address='" . db_escape($USERID_USERNAME) . "'");
@@ -155,7 +156,7 @@
bindtextdomain('postfixadmin', SM_PATH . 'plugins/postfixadmin/locale');
textdomain('postfixadmin');
- echo "". _("Alias successfully changend!"). "\n
";
+ echo "". _("Alias successfully changed!"). "\n
";
bindtextdomain('squirrelmail', SM_PATH . 'locale');
textdomain('squirrelmail');
echo "". _("Click here to go back") ."
";
@@ -168,32 +169,28 @@
echo "
-". _("Options") ." - ". _("Edit Alias"). "
+". _("Options") ." - ". _("Edit Forward"). "
-". _("Edit an alias* for your domain.
One entry per line."). " |
+". _("Enter an email address (or addresses) where you would like an additional copy of messages addressed to you sent. One address per line."). " |
-| ". _("*Additional forward-aliase always recieve messages BBC!"). "\n
+ | ". _("The mail server you forward to should also accept mail in the format: recipient+spam@example.com. If it does not, please contact the postmaster of this domain and have an alias added"). ".\n |
-| " . _("To remove an alias, simply delete it's line from the text box") . ". |
+" . _("To remove a Forward, simply delete its line from the text box.") . " |
-
-
| |