[Jim Mayhugh]

I run a number of qmail servers that are set up with virtual accounts. In order to access the account, you have to enter the full e-mail address, ie mymail@mymail.com as the username, as well as the server address. This causes the address in the "From:" header and a few other places to show up as mymail@mymail.com@mymail.com.

Here's how to correct that:

1) Look for:

//CHANGE SETTINGS ABOVE//

Below it add:

$email_regular_expression="^([-!#\$%&'*+./0-9=?A-Z^_`a-z{|}~ ])+@([-!#\$%&'*+/0-9=?A-Z^_`a-z{|}~ ]+\\.)+[a-zA-Z]{2,4}\$";


2) Replace

if ($session_username) $errormessage .= " - ".$session_username."@".$session_server;

with


if (eregi($email_regular_expression, $session_username))
{
if ($session_username) $errormessage .= " - ".$session_username;
}
else
{
if ($session_username) $errormessage .= " - ".$session_username."@".$session_server;
}



3) For each single line occurence of
$generated=$session_username."@".$session_server;

(there are two), replace it with

if (eregi($email_regular_expression, $session_username))
{
$generated=$session_username;
}
else
{
$generated=$session_username."@".$session_server;
}


That should take care of it.