forked from extern/egroupware
importing the new class.smtp.php v2.1 for PHP5 and adapting eGroupWare specific changes
This commit is contained in:
parent
23c473690e
commit
a43593c431
@ -1,17 +1,28 @@
|
||||
<?php
|
||||
////////////////////////////////////////////////////
|
||||
// SMTP - PHP SMTP class
|
||||
//
|
||||
// Version 1.02
|
||||
//
|
||||
// Define an SMTP class that can be used to connect
|
||||
// and communicate with any SMTP server. It implements
|
||||
// all the SMTP functions defined in RFC821 except TURN.
|
||||
//
|
||||
// Author: Chris Ryan
|
||||
//
|
||||
// License: LGPL, see LICENSE
|
||||
////////////////////////////////////////////////////
|
||||
/*~ class.smtp.php
|
||||
.---------------------------------------------------------------------------.
|
||||
| Software: PHPMailer - PHP email class |
|
||||
| Version: 2.1 |
|
||||
| Contact: via sourceforge.net support pages (also www.codeworxtech.com) |
|
||||
| Info: http://phpmailer.sourceforge.net |
|
||||
| Support: http://sourceforge.net/projects/phpmailer/ |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| Author: Andy Prevost (project admininistrator) |
|
||||
| Author: Brent R. Matzelle (original founder) |
|
||||
| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved. |
|
||||
| Copyright (c) 2001-2003, Brent R. Matzelle |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| License: Distributed under the Lesser General Public License (LGPL) |
|
||||
| http://www.gnu.org/copyleft/lesser.html |
|
||||
| This program is distributed in the hope that it will be useful - WITHOUT |
|
||||
| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
||||
| FITNESS FOR A PARTICULAR PURPOSE. |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| We offer a number of paid services (www.codeworxtech.com): |
|
||||
| - Web Hosting on highly optimized fast and secure servers |
|
||||
| - Technology Consulting |
|
||||
| - Oursourcing (highly qualified programmers and graphic designers) |
|
||||
'---------------------------------------------------------------------------'
|
||||
|
||||
/**
|
||||
* SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
|
||||
@ -21,32 +32,38 @@
|
||||
* @package PHPMailer
|
||||
* @author Chris Ryan
|
||||
*/
|
||||
class SMTP
|
||||
{
|
||||
|
||||
class SMTP {
|
||||
/**
|
||||
* SMTP server port
|
||||
* @var int
|
||||
*/
|
||||
var $SMTP_PORT = 25;
|
||||
public $SMTP_PORT = 25;
|
||||
|
||||
/**
|
||||
* SMTP reply line ending
|
||||
* @var string
|
||||
*/
|
||||
var $CRLF = "\r\n";
|
||||
public $CRLF = "\r\n";
|
||||
|
||||
/**
|
||||
* Sets whether debugging is turned on
|
||||
* @var bool
|
||||
*/
|
||||
var $do_debug; # the level of debug to perform
|
||||
public $do_debug; // the level of debug to perform
|
||||
|
||||
/**
|
||||
* Sets VERP use on/off (default is off)
|
||||
* @var bool
|
||||
*/
|
||||
public $do_verp = false;
|
||||
|
||||
/**#@+
|
||||
* @access private
|
||||
*/
|
||||
var $smtp_conn; # the socket to the server
|
||||
var $error; # error if any on the last call
|
||||
var $helo_rply; # the reply the server sent to us for HELO
|
||||
private $smtp_conn; // the socket to the server
|
||||
private $error; // error if any on the last call
|
||||
private $helo_rply; // the reply the server sent to us for HELO
|
||||
/**#@-*/
|
||||
|
||||
/**
|
||||
@ -54,7 +71,7 @@ class SMTP
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function SMTP() {
|
||||
public function __construct() {
|
||||
$this->smtp_conn = 0;
|
||||
$this->error = null;
|
||||
$this->helo_rply = null;
|
||||
@ -79,17 +96,17 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Connect($host,$port=0,$tval=30) {
|
||||
# set the error val to null so there is no confusion
|
||||
public function Connect($host,$port=0,$tval=30) {
|
||||
/* set the error val to null so there is no confusion */
|
||||
$this->error = null;
|
||||
|
||||
# make sure we are __not__ connected
|
||||
/* make sure we are __not__ connected */
|
||||
if($this->connected()) {
|
||||
# ok we are connected! what should we do?
|
||||
# for now we will just give an error saying we
|
||||
# are already connected
|
||||
$this->error =
|
||||
array("error" => "Already connected to a server");
|
||||
/* ok we are connected! what should we do?
|
||||
* for now we will just give an error saying we
|
||||
* are already connected
|
||||
*/
|
||||
$this->error = array("error" => "Already connected to a server");
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -97,13 +114,13 @@ class SMTP
|
||||
$port = $this->SMTP_PORT;
|
||||
}
|
||||
|
||||
#connect to the smtp server
|
||||
$this->smtp_conn = fsockopen($host, # the host of the server
|
||||
$port, # the port to use
|
||||
$errno, # error number if any
|
||||
$errstr, # error message if any
|
||||
$tval); # give up after ? secs
|
||||
# verify we connected properly
|
||||
/* connect to the smtp server */
|
||||
$this->smtp_conn = fsockopen($host, // the host of the server
|
||||
$port, // the port to use
|
||||
$errno, // error number if any
|
||||
$errstr, // error message if any
|
||||
$tval); // give up after ? secs
|
||||
/* verify we connected properly */
|
||||
if(empty($this->smtp_conn)) {
|
||||
$this->error = array("error" => "Failed to connect to server",
|
||||
"errno" => $errno,
|
||||
@ -115,16 +132,17 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
# sometimes the SMTP server takes a little longer to respond
|
||||
# so we will give it a longer timeout for the first read
|
||||
// Windows still does not have support for this timeout function
|
||||
/* sometimes the SMTP server takes a little longer to respond
|
||||
* so we will give it a longer timeout for the first read
|
||||
* - Windows still does not have support for this timeout function
|
||||
*/
|
||||
if(substr(PHP_OS, 0, 3) != "WIN")
|
||||
socket_set_timeout($this->smtp_conn, $tval, 0);
|
||||
|
||||
# get any announcement stuff
|
||||
/* get any announcement stuff */
|
||||
$announce = $this->get_lines();
|
||||
|
||||
# set the timeout of any socket functions at 1/10 of a second
|
||||
/* set the timeout of any socket functions at 1/10 of a second */
|
||||
//if(function_exists("socket_set_timeout"))
|
||||
// socket_set_timeout($this->smtp_conn, 0, 100000);
|
||||
|
||||
@ -135,13 +153,58 @@ class SMTP
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initiate a TSL communication with the server.
|
||||
*
|
||||
* SMTP CODE 220 Ready to start TLS
|
||||
* SMTP CODE 501 Syntax error (no parameters allowed)
|
||||
* SMTP CODE 454 TLS not available due to temporary reason
|
||||
* @access public
|
||||
* @return bool success
|
||||
*/
|
||||
public function StartTLS() {
|
||||
$this->error = null; # to avoid confusion
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array("error" => "Called StartTLS() without being connected");
|
||||
return false;
|
||||
}
|
||||
|
||||
fputs($this->smtp_conn,"STARTTLS" . $extra . $this->CRLF);
|
||||
|
||||
$rply = $this->get_lines();
|
||||
$code = substr($rply,0,3);
|
||||
|
||||
if($this->do_debug >= 2) {
|
||||
echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
|
||||
}
|
||||
|
||||
if($code != 220) {
|
||||
$this->error =
|
||||
array("error" => "STARTTLS not accepted from server",
|
||||
"smtp_code" => $code,
|
||||
"smtp_msg" => substr($rply,4));
|
||||
if($this->do_debug >= 1) {
|
||||
echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//Begin encrypted connection
|
||||
if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs SMTP authentication. Must be run after running the
|
||||
* Hello() method. Returns true if successfully authenticated.
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Authenticate($username, $password) {
|
||||
public function Authenticate($username, $password) {
|
||||
// Start authentication
|
||||
fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
|
||||
|
||||
@ -201,15 +264,15 @@ class SMTP
|
||||
|
||||
/**
|
||||
* Returns true if connected to a server otherwise false
|
||||
* @access private
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Connected() {
|
||||
public function Connected() {
|
||||
if(!empty($this->smtp_conn)) {
|
||||
$sock_status = socket_get_status($this->smtp_conn);
|
||||
if($sock_status["eof"]) {
|
||||
# hmm this is an odd situation... the socket is
|
||||
# valid but we aren't connected anymore
|
||||
// hmm this is an odd situation... the socket is
|
||||
// valid but we are not connected anymore
|
||||
if($this->do_debug >= 1) {
|
||||
echo "SMTP -> NOTICE:" . $this->CRLF .
|
||||
"EOF caught while checking if connected";
|
||||
@ -217,7 +280,7 @@ class SMTP
|
||||
$this->Close();
|
||||
return false;
|
||||
}
|
||||
return true; # everything looks good
|
||||
return true; // everything looks good
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -229,17 +292,16 @@ class SMTP
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
function Close() {
|
||||
$this->error = null; # so there is no confusion
|
||||
public function Close() {
|
||||
$this->error = null; // so there is no confusion
|
||||
$this->helo_rply = null;
|
||||
if(!empty($this->smtp_conn)) {
|
||||
# close the connection and cleanup
|
||||
// close the connection and cleanup
|
||||
fclose($this->smtp_conn);
|
||||
$this->smtp_conn = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/***************************************************************
|
||||
* SMTP COMMANDS *
|
||||
*************************************************************/
|
||||
@ -263,8 +325,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Data($msg_data) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Data($msg_data) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -293,63 +355,68 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
# the server is ready to accept data!
|
||||
# according to rfc 821 we should not send more than 1000
|
||||
# including the CRLF
|
||||
# characters on a single line so we will break the data up
|
||||
# into lines by \r and/or \n then if needed we will break
|
||||
# each of those into smaller lines to fit within the limit.
|
||||
# in addition we will be looking for lines that start with
|
||||
# a period '.' and append and additional period '.' to that
|
||||
# line. NOTE: this does not count towards are limit.
|
||||
/* the server is ready to accept data!
|
||||
* according to rfc 821 we should not send more than 1000
|
||||
* including the CRLF
|
||||
* characters on a single line so we will break the data up
|
||||
* into lines by \r and/or \n then if needed we will break
|
||||
* each of those into smaller lines to fit within the limit.
|
||||
* in addition we will be looking for lines that start with
|
||||
* a period '.' and append and additional period '.' to that
|
||||
* line. NOTE: this does not count towards are limit.
|
||||
*/
|
||||
|
||||
# normalize the line breaks so we know the explode works
|
||||
// normalize the line breaks so we know the explode works
|
||||
$msg_data = str_replace("\r\n","\n",$msg_data);
|
||||
$msg_data = str_replace("\r","\n",$msg_data);
|
||||
$lines = explode("\n",$msg_data);
|
||||
|
||||
# we need to find a good way to determine is headers are
|
||||
# in the msg_data or if it is a straight msg body
|
||||
# currently I'm assuming rfc 822 definitions of msg headers
|
||||
# and if the first field of the first line (':' sperated)
|
||||
# does not contain a space then it _should_ be a header
|
||||
# and we can process all lines before a blank "" line as
|
||||
# headers.
|
||||
/* we need to find a good way to determine is headers are
|
||||
* in the msg_data or if it is a straight msg body
|
||||
* currently I am assuming rfc 822 definitions of msg headers
|
||||
* and if the first field of the first line (':' sperated)
|
||||
* does not contain a space then it _should_ be a header
|
||||
* and we can process all lines before a blank "" line as
|
||||
* headers.
|
||||
*/
|
||||
$field = substr($lines[0],0,strpos($lines[0],":"));
|
||||
$in_headers = false;
|
||||
if(!empty($field) && strpos($field," ") === false) {
|
||||
$in_headers = true;
|
||||
}
|
||||
|
||||
$max_line_length = 998; # used below; set here for ease in change
|
||||
$max_line_length = 998; // used below; set here for ease in change
|
||||
|
||||
while(list(,$line) = @each($lines)) {
|
||||
$lines_out = null;
|
||||
if($line == "" && $in_headers) {
|
||||
$in_headers = false;
|
||||
}
|
||||
# ok we need to break this line up into several
|
||||
# smaller lines
|
||||
// ok we need to break this line up into several smaller lines
|
||||
while(strlen($line) > $max_line_length) {
|
||||
$pos = strrpos(substr($line,0,$max_line_length)," ");
|
||||
|
||||
# Patch to fix DOS attack
|
||||
// Patch to fix DOS attack
|
||||
if(!$pos) {
|
||||
$pos = $max_line_length - 1;
|
||||
}
|
||||
|
||||
$lines_out[] = substr($line,0,$pos);
|
||||
$line = substr($line,$pos);
|
||||
} else {
|
||||
$lines_out[] = substr($line,0,$pos);
|
||||
$line = substr($line,$pos + 1);
|
||||
# if we are processing headers we need to
|
||||
# add a LWSP-char to the front of the new line
|
||||
# rfc 822 on long msg headers
|
||||
}
|
||||
|
||||
/* if we are processing headers we need to
|
||||
* add a LWSP-char to the front of the new line
|
||||
* rfc 822 on long msg headers
|
||||
*/
|
||||
if($in_headers) {
|
||||
$line = "\t" . $line;
|
||||
}
|
||||
}
|
||||
$lines_out[] = $line;
|
||||
|
||||
# now send the lines to the server
|
||||
// now send the lines to the server
|
||||
while(list(,$line_out) = @each($lines_out)) {
|
||||
if(strlen($line_out) > 0)
|
||||
{
|
||||
@ -361,13 +428,11 @@ class SMTP
|
||||
}
|
||||
}
|
||||
|
||||
# ok all the message data has been sent so lets get this
|
||||
# over with aleady
|
||||
// ok all the message data has been sent so lets get this
|
||||
// over with aleady
|
||||
fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
|
||||
|
||||
# get server response
|
||||
// get server response
|
||||
$rply = $this->get_lines();
|
||||
|
||||
# if the server is slow try to get an answer within 30 seconds
|
||||
$timeout_counter = 0;
|
||||
while(($rply=="") && ($timeout_counter<30))
|
||||
@ -389,7 +454,6 @@ class SMTP
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
$code = substr($rply,0,3);
|
||||
|
||||
if($this->do_debug >= 2) {
|
||||
@ -426,8 +490,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return string array
|
||||
*/
|
||||
function Expand($name) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Expand($name) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -456,7 +520,7 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
# parse the reply and place in our array to return to user
|
||||
// parse the reply and place in our array to return to user
|
||||
$entries = explode($this->CRLF,$rply);
|
||||
while(list(,$l) = @each($entries)) {
|
||||
$list[] = substr($l,4);
|
||||
@ -477,8 +541,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Hello($host="") {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Hello($host="") {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -486,11 +550,11 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
# if a hostname for the HELO wasn't specified determine
|
||||
# a suitable one to send
|
||||
// if a hostname for the HELO was not specified determine
|
||||
//a suitable one to send
|
||||
if(empty($host)) {
|
||||
# we need to determine some sort of appopiate default
|
||||
# to send to the server
|
||||
// we need to determine some sort of appopiate default
|
||||
// to send to the server
|
||||
$host = "localhost";
|
||||
}
|
||||
|
||||
@ -509,7 +573,7 @@ class SMTP
|
||||
* @access private
|
||||
* @return bool
|
||||
*/
|
||||
function SendHello($hello, $host) {
|
||||
private function SendHello($hello, $host) {
|
||||
fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
|
||||
|
||||
$rply = $this->get_lines();
|
||||
@ -551,8 +615,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
function Help($keyword="") {
|
||||
$this->error = null; # to avoid confusion
|
||||
public function Help($keyword="") {
|
||||
$this->error = null; // to avoid confusion
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -603,8 +667,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Mail($from) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Mail($from) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -612,7 +676,8 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $this->CRLF);
|
||||
$useVerp = ($this->do_verp ? "XVERP" : "");
|
||||
fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
|
||||
|
||||
$rply = $this->get_lines();
|
||||
$code = substr($rply,0,3);
|
||||
@ -645,8 +710,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Noop() {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Noop() {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -688,8 +753,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Quit($close_on_error=true) {
|
||||
$this->error = null; # so there is no confusion
|
||||
public function Quit($close_on_error=true) {
|
||||
$this->error = null; // so there is no confusion
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -697,10 +762,10 @@ class SMTP
|
||||
return false;
|
||||
}
|
||||
|
||||
# send the quit command to the server
|
||||
// send the quit command to the server
|
||||
fputs($this->smtp_conn,"quit" . $this->CRLF);
|
||||
|
||||
# get any good-bye messages
|
||||
// get any good-bye messages
|
||||
$byemsg = $this->get_lines();
|
||||
|
||||
if($this->do_debug >= 2) {
|
||||
@ -712,7 +777,7 @@ class SMTP
|
||||
|
||||
$code = substr($byemsg,0,3);
|
||||
if($code != 221) {
|
||||
# use e as a tmp var cause Close will overwrite $this->error
|
||||
// use e as a tmp var cause Close will overwrite $this->error
|
||||
$e = array("error" => "SMTP server rejected quit command",
|
||||
"smtp_code" => $code,
|
||||
"smtp_rply" => substr($byemsg,4));
|
||||
@ -742,8 +807,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Recipient($to) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Recipient($to) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -786,8 +851,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Reset() {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Reset() {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -835,8 +900,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Send($from) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Send($from) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -883,8 +948,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function SendAndMail($from) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function SendAndMail($from) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -931,8 +996,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function SendOrMail($from) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function SendOrMail($from) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -976,7 +1041,7 @@ class SMTP
|
||||
* @access public
|
||||
* @return bool
|
||||
*/
|
||||
function Turn() {
|
||||
public function Turn() {
|
||||
$this->error = array("error" => "This method, TURN, of the SMTP ".
|
||||
"is not implemented");
|
||||
if($this->do_debug >= 1) {
|
||||
@ -998,8 +1063,8 @@ class SMTP
|
||||
* @access public
|
||||
* @return int
|
||||
*/
|
||||
function Verify($name) {
|
||||
$this->error = null; # so no confusion is caused
|
||||
public function Verify($name) {
|
||||
$this->error = null; // so no confusion is caused
|
||||
|
||||
if(!$this->connected()) {
|
||||
$this->error = array(
|
||||
@ -1043,9 +1108,9 @@ class SMTP
|
||||
* @access private
|
||||
* @return string
|
||||
*/
|
||||
function get_lines() {
|
||||
private function get_lines() {
|
||||
$data = "";
|
||||
while($str = fgets($this->smtp_conn,515)) {
|
||||
while($str = @fgets($this->smtp_conn,515)) {
|
||||
if($this->do_debug >= 4) {
|
||||
echo "SMTP -> get_lines(): \$data was \"$data\"" .
|
||||
$this->CRLF;
|
||||
@ -1056,8 +1121,8 @@ class SMTP
|
||||
if($this->do_debug >= 4) {
|
||||
echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF;
|
||||
}
|
||||
# if the 4th character is a space then we are done reading
|
||||
# so just break the loop
|
||||
// if the 4th character is a space then we are done reading
|
||||
// so just break the loop
|
||||
if(substr($str,3,1) == " ") { break; }
|
||||
}
|
||||
return $data;
|
||||
@ -1065,4 +1130,5 @@ class SMTP
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
?>
|
||||
|
Loading…
Reference in New Issue
Block a user