diff -Naur mail-old/xaradmin/updateconfig.php mail-new/xaradmin/updateconfig.php --- mail-old/xaradmin/updateconfig.php 2005-04-09 15:13:29.000000000 -0700 +++ mail-new/xaradmin/updateconfig.php 2006-02-05 13:32:10.000000000 -0800 @@ -48,6 +48,8 @@ if (!xarVarFetch('smtpHost', 'str:1:', $smtpHost, '', XARVAR_NOT_REQUIRED)) return; if (!xarVarFetch('smtpPort', 'int:1:', $smtpPort, '25', XARVAR_NOT_REQUIRED)) return; if (!xarVarFetch('smtpAuth', 'checkbox', $smtpAuth, false, XARVAR_NOT_REQUIRED)) return; + if (!xarVarFetch('smtpPOPFirst', 'checkbox', $smtpPOPFirst, false, XARVAR_NOT_REQUIRED)) return; + if (!xarVarFetch('smtpPOPPort', 'int:1:', $smtpPOPPort, '110', XARVAR_NOT_REQUIRED)) return; if (!xarVarFetch('htmlheader', 'str:1:', $htmlheader, '', XARVAR_NOT_REQUIRED)) return; if (!xarVarFetch('smtpUserName', 'str:1:', $smtpUserName, '', XARVAR_NOT_REQUIRED)) return; if (!xarVarFetch('smtpPassword', 'str:1:', $smtpPassword, '', XARVAR_NOT_REQUIRED)) return; @@ -76,6 +78,8 @@ xarModSetVar('mail', 'smtpHost', $smtpHost); xarModSetVar('mail', 'smtpPort', $smtpPort); xarModSetVar('mail', 'smtpAuth', $smtpAuth); + xarModSetVar('mail', 'smtpPOPFirst', $smtpPOPFirst); + xarModSetVar('mail', 'smtpPOPPort', $smtpPOPPort); xarModSetVar('mail', 'smtpUserName', $smtpUserName); if (!empty($smtpPassword)) { xarModSetVar('mail', 'smtpPassword', $smtpPassword); diff -Naur mail-old/xaradminapi/_sendmail.php mail-new/xaradminapi/_sendmail.php --- mail-old/xaradminapi/_sendmail.php 2005-04-09 15:13:29.000000000 -0700 +++ mail-new/xaradminapi/_sendmail.php 2006-02-05 13:32:14.000000000 -0800 @@ -112,6 +112,11 @@ // the smtp server might require authentication if (xarModGetVar('mail', 'smtpAuth')) { $mail->SMTPAuth = true; // turn on SMTP authentication + // the smtp server might require POP authentication first + if (xarModGetVar('mail', 'smtpPOPFirst')) { + $mail->POPFirst = true; // turn on POP-First authentication + $mail->POPPort = xarModGetVar('mail', 'smtpPOPPort'); // SMTP Port default 110. + } $mail->Username = xarModGetVar('mail', 'smtpUserName'); // SMTP username $mail->Password = xarModGetVar('mail', 'smtpPassword'); // SMTP password } diff -Naur mail-old/xarclass/class.phpmailer.php mail-new/xarclass/class.phpmailer.php --- mail-old/xarclass/class.phpmailer.php 2005-04-09 15:13:29.000000000 -0700 +++ mail-new/xarclass/class.phpmailer.php 2006-02-05 13:32:29.000000000 -0800 @@ -156,10 +156,12 @@ var $Host = "localhost"; /** - * Sets the default SMTP server port. + * Sets the default SMTP (and POP ) server port. * @var int */ var $Port = 25; + var $POPPort = 110; + /** * Sets the SMTP HELO of the message (Default is $Hostname). @@ -173,6 +175,11 @@ */ var $SMTPAuth = false; + /** + * Sets whether POP access is required first (a.k.a. pop-before-smtp) + */ + var $POPFirst = false; + /** * Sets SMTP username. * @var string @@ -249,6 +256,14 @@ } /** + * Sets whether POP is required first (pop-before-smtp) + * @return void + */ + function IsPOPFirst() { + $this->POPFirst = true; + } + + /** * Sets Mailer to send message using PHP mail() function. * @return void */ @@ -531,6 +546,15 @@ function SmtpConnect() { if($this->smtp == NULL) { $this->smtp = new SMTP(); } + if ($this->POPFirst) { + include_once $this->PluginDir . 'pop3.php'; + #include_once $this->PluginDir . 'sasl.php'; + $this->smtp->POPFirst = $this->POPFirst; + $this->smtp->Username = $this->Username; + $this->smtp->Password = $this->Password; + $this->smtp->POPPort = $this->POPPort; + } + $this->smtp->do_debug = $this->SMTPDebug; $hosts = explode(";", $this->Host); $index = 0; @@ -554,7 +578,7 @@ else $this->smtp->Hello($this->ServerHostname()); - if($this->SMTPAuth) + if($this->SMTPAuth && !$this->POPFirst) { if(!$this->smtp->Authenticate($this->Username, $this->Password)) diff -Naur mail-old/xarclass/class.smtp.php mail-new/xarclass/class.smtp.php --- mail-old/xarclass/class.smtp.php 2005-04-09 15:13:29.000000000 -0700 +++ mail-new/xarclass/class.smtp.php 2006-02-05 13:32:34.000000000 -0800 @@ -98,6 +98,39 @@ $port = $this->SMTP_PORT; } + /** + * Some servers will only allow SMTP mail if you authenticate via POP + * (typically this means checking POP email) before trying to send. + * So we include a class from phpclasses.com to log in for us, since + * phpmailer doesn't do that. + */ + if ($this->POPFirst) { + + # see modules/mail/xarclass/pop3.php for more. + $pop3=new pop3_class; + $pop3->hostname=$host; /* POP 3 server host name */ + $pop3->port=$this->POPPort; /* POP 3 server host port */ + $user=$this->Username; /* Authentication user name */ + $password=$this->Password; /* Authentication password */ + + # try to connect + $error = $pop3->Open(); + if (!$error) { + # we connected, so now log in + $error = $pop3->Login($user,$password); + if (!$error) { + # done, so close connection. Server should allow us to + # send SMTP mail for at least the next minute or so... + $error = $pop3->Close(); + } + } + if($error) { + echo "POPFIRST -> ERROR: " . $error . $this->CRLF; + return false; + } + + } + #connect to the smtp server $this->smtp_conn = fsockopen($host, # the host of the server $port, # the port to use diff -Naur mail-old/xarclass/pop3.php mail-new/xarclass/pop3.php --- mail-old/xarclass/pop3.php 1969-12-31 16:00:00.000000000 -0800 +++ mail-new/xarclass/pop3.php 2006-02-05 13:32:38.000000000 -0800 @@ -0,0 +1,528 @@ +next_token; + } + for($character=0;$characternext_token=substr($string,$found+1); + return(substr($string,0,$found)); + } + else + { + $this->next_token=""; + return($string); + } + } + + Function SetError($error) + { + return($this->error=$error); + } + + Function OutputDebug($message) + { + $message.="\n"; + if($this->html_debug) + $message=str_replace("\n","
\n",HtmlEntities($message)); + echo $message; + flush(); + } + + Function GetLine() + { + for($line="";;) + { + if(feof($this->connection)) + return(0); + $line.=fgets($this->connection,100); + $length=strlen($line); + if($length>=2 + && substr($line,$length-2,2)=="\r\n") + { + $line=substr($line,0,$length-2); + if($this->debug) + $this->OutputDebug("S $line"); + return($line); + } + } + } + + Function PutLine($line) + { + if($this->debug) + $this->OutputDebug("C $line"); + return(fputs($this->connection,"$line\r\n")); + } + + Function OpenConnection() + { + if($this->hostname=="") + return($this->SetError("2 it was not specified a valid hostname")); + if($this->debug) + $this->OutputDebug("Connecting to ".$this->hostname." ..."); + if(($this->connection=@fsockopen($this->hostname,$this->port,$error))==0) + { + switch($error) + { + case -3: + return($this->SetError("-3 socket could not be created")); + case -4: + return($this->SetError("-4 dns lookup on hostname \"$hostname\" failed")); + case -5: + return($this->SetError("-5 connection refused or timed out")); + case -6: + return($this->SetError("-6 fdopen() call failed")); + case -7: + return($this->SetError("-7 setvbuf() call failed")); + default: + return($this->SetError($error." could not connect to the host \"".$this->hostname."\"")); + } + } + return(""); + } + + Function CloseConnection() + { + if($this->debug) + $this->OutputDebug("Closing connection."); + if($this->connection!=0) + { + fclose($this->connection); + $this->connection=0; + } + } + + /* Public methods */ + + /* Open method - set the object variable $hostname to the POP3 server address. */ + + Function Open() + { + if($this->state!="DISCONNECTED") + return($this->SetError("1 a connection is already opened")); + if(($error=$this->OpenConnection())!="") + return($error); + $this->greeting=$this->GetLine(); + if(GetType($this->greeting)!="string" + || $this->Tokenize($this->greeting," ")!="+OK") + { + $this->CloseConnection(); + return($this->SetError("3 POP3 server greeting was not found")); + } + $this->Tokenize("<"); + $this->must_update=0; + $this->state="AUTHORIZATION"; + return(""); + } + + /* Close method - this method must be called at least if there are any + messages to be deleted */ + + Function Close() + { + if($this->state=="DISCONNECTED") + return($this->SetError("no connection was opened")); + if($this->must_update + || $this->quit_handshake) + { + if($this->PutLine("QUIT")==0) + return($this->SetError("Could not send the QUIT command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get quit command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not quit the connection: ".$this->Tokenize("\r\n"))); + } + $this->CloseConnection(); + $this->state="DISCONNECTED"; + return(""); + } + + /* Login method - pass the user name and password of POP account. Set + $apop to 1 or 0 wether you want to login using APOP method or not. */ + + Function Login($user,$password,$apop=0) + { + if($this->state!="AUTHORIZATION") + return($this->SetError("connection is not in AUTHORIZATION state")); + if($apop) + { + if(!strcmp($this->greeting,"")) + return($this->SetError("Server does not seem to support APOP authentication")); + if($this->PutLine("APOP $user ".md5("<".$this->greeting.">".$password))==0) + return($this->SetError("Could not send the APOP command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get APOP login command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("APOP login failed: ".$this->Tokenize("\r\n"))); + } + else + { + $authenticated=0; + if(strcmp($this->authentication_mechanism,"USER") + && function_exists("class_exists") + && class_exists("sasl_client_class")) + { + if(strlen($this->authentication_mechanism)) + $mechanisms=array($this->authentication_mechanism); + else + { + $mechanisms=array(); + if($this->PutLine("CAPA")==0) + return($this->SetError("Could not send the CAPA command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get CAPA command response")); + if(!strcmp($this->Tokenize($response," "),"+OK")) + { + for(;;) + { + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not retrieve the supported authentication methods")); + switch($this->Tokenize($response," ")) + { + case ".": + break 2; + case "SASL": + for($method=1;strlen($mechanism=$this->Tokenize(" "));$method++) + $mechanisms[]=$mechanism; + break; + } + } + } + } + $sasl=new sasl_client_class; + $sasl->SetCredential("user",$user); + $sasl->SetCredential("password",$password); + if(strlen($this->realm)) + $sasl->SetCredential("realm",$this->realm); + if(strlen($this->workstation)) + $sasl->SetCredential("workstation",$this->workstation); + do + { + $status=$sasl->Start($mechanisms,$message,$interactions); + } + while($status==SASL_INTERACT); + switch($status) + { + case SASL_CONTINUE: + break; + case SASL_NOMECH: + if(strlen($this->authentication_mechanism)) + return($this->SetError("authenticated mechanism ".$this->authentication_mechanism." may not be used: ".$sasl->error)); + break; + default: + return($this->SetError("Could not start the SASL authentication client: ".$sasl->error)); + } + if(strlen($sasl->mechanism)) + { + if($this->PutLine("AUTH ".$sasl->mechanism.(IsSet($message) ? " ".base64_encode($message) : ""))==0) + return("Could not send the AUTH command"); + $response=$this->GetLine(); + if(GetType($response)!="string") + return("Could not get AUTH command response"); + switch($this->Tokenize($response," ")) + { + case "+OK": + $response=""; + break; + case "+": + $response=base64_decode($this->Tokenize("\r\n")); + break; + default: + return($this->SetError("Authentication error: ".$this->Tokenize("\r\n"))); + } + for(;!$authenticated;) + { + do + { + $status=$sasl->Step($response,$message,$interactions); + } + while($status==SASL_INTERACT); + switch($status) + { + case SASL_CONTINUE: + if($this->PutLine(base64_encode($message))==0) + return("Could not send message authentication step message"); + $response=$this->GetLine(); + if(GetType($response)!="string") + return("Could not get authentication step message response"); + switch($this->Tokenize($response," ")) + { + case "+OK": + $authenticated=1; + break; + case "+": + $response=base64_decode($this->Tokenize("\r\n")); + break; + default: + return($this->SetError("Authentication error: ".$this->Tokenize("\r\n"))); + } + break; + default: + return($this->SetError("Could not process the SASL authentication step: ".$sasl->error)); + } + } + } + } + if(!$authenticated) + { + if($this->PutLine("USER $user")==0) + return($this->SetError("Could not send the USER command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get user login entry response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("User error: ".$this->Tokenize("\r\n"))); + if($this->PutLine("PASS $password")==0) + return($this->SetError("Could not send the PASS command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get login password entry response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Password error: ".$this->Tokenize("\r\n"))); + } + } + $this->state="TRANSACTION"; + return(""); + } + + /* Statistics method - pass references to variables to hold the number of + messages in the mail box and the size that they take in bytes. */ + + Function Statistics(&$messages,&$size) + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($this->PutLine("STAT")==0) + return($this->SetError("Could not send the STAT command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get the statistics command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not get the statistics: ".$this->Tokenize("\r\n"))); + $messages=$this->Tokenize(" "); + $size=$this->Tokenize(" "); + return(""); + } + + /* ListMessages method - the $message argument indicates the number of a + message to be listed. If you specify an empty string it will list all + messages in the mail box. The $unique_id flag indicates if you want + to list the each message unique identifier, otherwise it will + return the size of each message listed. If you list all messages the + result will be returned in an array. */ + + Function ListMessages($message,$unique_id) + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($unique_id) + $list_command="UIDL"; + else + $list_command="LIST"; + if($this->PutLine("$list_command".($message ? " ".$message : ""))==0) + return($this->SetError("Could not send the $list_command command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get message list command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not get the message listing: ".$this->Tokenize("\r\n"))); + if($message=="") + { + for($messages=array();;) + { + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get message list response")); + if($response==".") + break; + $message=intval($this->Tokenize($response," ")); + if($unique_id) + $messages[$message]=$this->Tokenize(" "); + else + $messages[$message]=intval($this->Tokenize(" ")); + } + return($messages); + } + else + { + $message=intval($this->Tokenize(" ")); + $value=$this->Tokenize(" "); + return($unique_id ? $value : intval($value)); + } + } + + /* RetrieveMessage method - the $message argument indicates the number of + a message to be listed. Pass a reference variables that will hold the + arrays of the $header and $body lines. The $lines argument tells how + many lines of the message are to be retrieved. Pass a negative number + if you want to retrieve the whole message. */ + + Function RetrieveMessage($message,&$headers,&$body,$lines) + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($lines<0) + { + $command="RETR"; + $arguments="$message"; + } + else + { + $command="TOP"; + $arguments="$message $lines"; + } + if($this->PutLine("$command $arguments")==0) + return($this->SetError("Could not send the $command command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get message retrieval command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not retrieve the message: ".$this->Tokenize("\r\n"))); + for($headers=$body=array(),$line=0;;) + { + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not retrieve the message")); + switch($response) + { + case ".": + return(""); + case "": + break 2; + default: + if(substr($response,0,1)==".") + $response=substr($response,1,strlen($response)-1); + break; + } + if($this->join_continuation_header_lines + && $line>0 + && ($response[0]=="\t" + || $response[0]==" ")) + $headers[$line-1].=$response; + else + { + $headers[$line]=$response; + $line++; + } + } + for($line=0;;$line++) + { + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not retrieve the message")); + switch($response) + { + case ".": + return(""); + default: + if(substr($response,0,1)==".") + $response=substr($response,1,strlen($response)-1); + break; + } + $body[$line]=$response; + } + return(""); + } + + /* DeleteMessage method - the $message argument indicates the number of + a message to be marked as deleted. Messages will only be effectively + deleted upon a successful call to the Close method. */ + + Function DeleteMessage($message) + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($this->PutLine("DELE $message")==0) + return($this->SetError("Could not send the DELE command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get message delete command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not delete the message: ".$this->Tokenize("\r\n"))); + $this->must_update=1; + return(""); + } + + /* ResetDeletedMessages method - Reset the list of marked to be deleted + messages. No messages will be marked to be deleted upon a successful + call to this method. */ + + Function ResetDeletedMessages() + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($this->PutLine("RSET")==0) + return($this->SetError("Could not send the RSET command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not get reset deleted messages command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not reset deleted messages: ".$this->Tokenize("\r\n"))); + $this->must_update=0; + return(""); + } + + /* IssueNOOP method - Just pings the server to prevent it auto-close the + connection after an idle timeout (tipically 10 minutes). Not very + useful for most likely uses of this class. It's just here for + protocol support completeness. */ + + Function IssueNOOP() + { + if($this->state!="TRANSACTION") + return($this->SetError("connection is not in TRANSACTION state")); + if($this->PutLine("NOOP")==0) + return($this->SetError("Could not send the NOOP command")); + $response=$this->GetLine(); + if(GetType($response)!="string") + return($this->SetError("Could not NOOP command response")); + if($this->Tokenize($response," ")!="+OK") + return($this->SetError("Could not issue the NOOP command: ".$this->Tokenize("\r\n"))); + return(""); + } +}; + +?> \ No newline at end of file diff -Naur mail-old/xartemplates/admin-modifyconfig.xd mail-new/xartemplates/admin-modifyconfig.xd --- mail-old/xartemplates/admin-modifyconfig.xd 2005-06-12 07:13:56.000000000 -0700 +++ mail-new/xartemplates/admin-modifyconfig.xd 2006-02-05 13:33:13.000000000 -0800 @@ -289,6 +289,27 @@ + +
+ + + + + + +
+ + +
+ + +
+ +