Bouncing email notifications added on login. DKIM support added for outgoing mail. PHP Mailer upgraded to v5.2.8

e107_admin/mailout.php

@@ -447,6 +447,10 @@ class mailout_main_ui extends e_admin_ui
 			{
 				$this->saveMailPrefs($mes); // TODO check if functional, $emessage -> $mes
 			}
+			elseif(!empty($_POST['DKIM_generate']))
+			{
+				$this->generateDKIM();
+			}
 		}
 		
 		
@@ -454,6 +458,78 @@ class mailout_main_ui extends e_admin_ui
 	}
 
 
+	/**
+	 *
+	 * https://www.mail-tester.com/spf-dkim-check
+	 * http://dkimvalidator.com/
+	 * @return bool
+	 */
+	private function generateDKIM()
+	{
+		$privatekeyfile = e_SYSTEM.'dkim_private.key';
+		$tp = e107::getParser();
+
+
+		if(file_exists($privatekeyfile))
+		{
+			e107::getMessage()->addInfo("DKIM keys already exists (".$privatekeyfile.")");
+
+			$text = $this->getDKIMPublicKey();
+			e107::getMessage()->addInfo("Add the following to your ".e_DOMAIN." DNS Zone records:".print_a($text,true));
+			e107::getMessage()->addinfo("Consider testing it using this website: http://dkimvalidator.com");
+
+			return false;
+		}
+
+		$keyLength = 1024; // Any higher and cPanel < 11.50 will refuse it.
+
+		$pk = openssl_pkey_new(
+			array(
+				"digest_alg" => "sha1",
+				'private_key_bits' => $keyLength, //  (2048 bits is the recommended minimum key length - gmail won't accept less than 1024 bits)
+				'private_key_type' => OPENSSL_KEYTYPE_RSA
+			)
+		);
+
+		openssl_pkey_export_to_file($pk, $privatekeyfile);
+
+	//	$contents = file_get_contents($privatekeyfile);
+
+		$tmp = openssl_pkey_get_details($pk);
+
+		$pubKey = $tmp['key'];
+
+		file_put_contents( e_SYSTEM."dkim_public.key",$pubKey);
+
+		//	e107::getMessage()->addInfo(nl2br($pubKey));
+
+		$pubString = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\n"),"",$pubKey);
+
+	//	$dnsEntry = 'phpmailer._domainkey	IN	TXT	"v=DKIM1; k=rsa; g=*; s=email; h=sha1; t=s; p=[x];"';
+		$dnsEntry = 'phpmailer._domainkey	IN	TXT	"v=DKIM1; k=rsa; p=[x];"';
+
+
+		$text = $tp->lanVars($dnsEntry, $pubString);
+		e107::getMessage()->addInfo("Add the following ".$keyLength." bit key to your ".e_DOMAIN." DNS Zone records:".print_a($text,true));
+		e107::getMessage()->addinfo("Consider testing it using this website: http://dkimvalidator.com");
+	}
+
+
+	private function getDKIMPublicKey()
+	{
+
+		$pubKey = file_get_contents( e_SYSTEM."dkim_public.key");
+
+		$pubString = str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\n"),"",$pubKey);
+
+		//	$dnsEntry = 'phpmailer._domainkey	IN	TXT	"v=DKIM1; k=rsa; g=*; s=email; h=sha1; t=s; p=[x];"';
+		$dnsEntry = 'phpmailer._domainkey	IN	TXT	"v=DKIM1; k=rsa; p=[x];"';
+
+		return e107::getParser()->lanVars($dnsEntry, $pubString);
+	}
+
+
+
 	private function sendTestBounce()
 	{
 		$mes = e107::getMessage();
@@ -1136,8 +1212,12 @@ class mailout_main_ui extends e_admin_ui
 		"</td>
 	</tr>\n";
 	*/
+	if(function_exists('openssl_pkey_new'))
+	{
 
-	
+		$text .= "<tr><td>DomainKeys Identified Mail (DKIM)</td><td class='form-inline'>".$frm->button('DKIM_generate',1,'primary','Generate Public/Private keys')."
+		</td></tr>";
+	}
 	$text .= "</table></fieldset>
 	<fieldset id='core-mail-prefs-bounce'>
 		<legend>".LAN_MAILOUT_31."</legend>
@@ -1211,7 +1291,13 @@ class mailout_main_ui extends e_admin_ui
 	
 	
 	</td></tr>
-	<tr><td>".LAN_MAILOUT_236."</td><td>".$lastBounceText."</td></tr>
+	<tr><td>".LAN_MAILOUT_236."</td><td>".$lastBounceText."</td></tr>";
+
+
+
+
+
+	$text .= "
 	</tbody></table>";
 
 	// Parameters for mail-account based bounce processing
@@ -1254,7 +1340,12 @@ class mailout_main_ui extends e_admin_ui
 
 	$check = ($pref['mail_bounce_auto']==1) ? " checked='checked'" : "";
 	$text .= "<tr><td>".LAN_MAILOUT_245."</td><td><input type='checkbox' name='mail_bounce_auto' value='1' {$check} /><span class='field-help'>&nbsp;".LAN_MAILOUT_246."</span></td></tr>
+				";
 
+
+
+
+				$text .= "
 	</tbody>
 	</table></fieldset>
 
@@ -1577,8 +1668,8 @@ class mailout_recipients_ui extends e_admin_ui
 			'checkboxes'			=> array('title'=> '',				'type' => null, 		'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),	
 			'mail_target_id'  		=> array('title' => LAN_MAILOUT_143, 'thclass' => 'left', 'forced' => TRUE),
 			'mail_recipient_id' 	=> array('title' => LAN_MAILOUT_142, 'type'=>'number', 'data'=>'int', 'thclass' => 'left', 'readonly'=>2),
-			'mail_recipient_name' 	=> array('title' => LAN_MAILOUT_141, 'type'=>'text', 'readonly'=>2, 'forced' => TRUE),
+			'mail_recipient_name' 	=> array('title' => LAN_MAILOUT_141, 'type'=>'text', 'data'=>'str', 'readonly'=>2, 'forced' => TRUE),
-			'mail_recipient_email' 	=> array('title' => LAN_MAILOUT_140, 'thclass' => 'left', 'forced' => TRUE),
+			'mail_recipient_email' 	=> array('title' => LAN_MAILOUT_140, 'type'=>'email', 'data'=>'str', 'thclass' => 'left', 'forced' => TRUE),
 			'mail_status' 			=> array('title' => LAN_MAILOUT_138, 'type'=>'method', 'filter'=>true, 'data'=>'int', 'thclass' => 'left', 'class'=>'left', 'writeParms'=>''),
 			'mail_detail_id' 		=> array('title' => LAN_MAILOUT_137, 'type'=>'dropdown', 'filter'=>true),
 			'mail_send_date' 		=> array('title' => LAN_MAILOUT_139, 'proc' => 'sdatetime'),

e107_handlers/login.php

@@ -191,11 +191,18 @@ class userlogin
 		switch ($this->userData['user_ban'])
 		{
 			case USER_REGISTERED_NOT_VALIDATED : // User not fully signed up - hasn't activated account.
-				return $this->invalidLogin($username,LOGIN_NOT_ACTIVATED);
+				return $this->invalidLogin($username, LOGIN_NOT_ACTIVATED);
 			case USER_BANNED :		// User banned
-				return $this->invalidLogin($username,LOGIN_BANNED,$this->userData['user_id']);
+				return $this->invalidLogin($username, LOGIN_BANNED,$this->userData['user_id']);
 			case USER_VALIDATED :		// Valid user
 				break;			// Nothing to do ATM
+			case USER_EMAIL_BOUNCED:
+				$bounceLAN      = "Emails to [x] are bouncing back. Please [verify your email address is correct]."; //TODO LAN
+				$bounceMessage  =  $tp->lanVars($bounceLAN, $this->userData['user_email'],true );
+				$bounceMessage  = str_replace(array('[',']'),array("<a href='".e_HTTP."usersettings.php'>","</a>"), $bounceMessage);
+
+				e107::getMessage()->addWarning($bounceMessage, 'default', true);
+				break;
 			default :			// May want to pick this up
 		}
 

e107_handlers/mail.php

@@ -320,6 +320,21 @@ class e107Email extends PHPMailer
 		$this->From 		= $tp->toHTML(vartrue($pref['replyto_email'],$overrides['siteadminemail']),'','RAWTEXT');
 		$this->WordWrap 	= 76;			// Set a sensible default
 
+		$pref['mail_dkim'] = 1;
+
+		$privatekeyfile = e_SYSTEM.'dkim_private.key';
+
+		if($pref['mail_dkim'] && is_readable($privatekeyfile))
+		{
+			$this->DKIM_domain      = e_DOMAIN; // 'example.com';
+			$this->DKIM_private     = $privatekeyfile;
+			$this->DKIM_selector    = 'phpmailer';
+			$this->DKIM_passphrase  = ''; //key is not encrypted
+			$this->DKIM_identifier  = $this->From;
+		}
+
+
+
 		// Now look for any overrides - slightly cumbersome way of doing it, but does give control over what can be set from here
 		// Options are those accepted by the arraySet() method.
 		if(!empty($overrides))

e107_handlers/mail_manager_class.php

@@ -1516,11 +1516,11 @@ class e107MailManager
 		{
 			$errors[] = 'Bad element count: '.count($vals);
 		}
-		elseif ($uid || $emailAddress) // Not using admin->mailout, so just update the user table for user_id = $uid; 
+		elseif (!empty($uid) || !empty($emailAddress)) // Update the user table for user_id = $uid;
 		{	
-			require_once(e_HANDLER.'user_handler.php');
+			// require_once(e_HANDLER.'user_handler.php');
-		
+			$err = e107::getUserSession()->userStatusUpdate('bounce', $uid, $emailAddress);
-			if($err = userHandler::userStatusUpdate('bounce', $uid, $emailAddress))
+			if($err)
 			{
 				$errors[] = $err;
 			}

e107_handlers/notify_class.php

@@ -238,7 +238,7 @@ class notify
 			$mailData = array(
 				'mail_total_count'      => count($recipients),
 				'mail_content_status' 	=> MAIL_STATUS_TEMP,
-				'mail_create_app' 		=> 'notify',
+				'mail_create_app' 		=> 'core',
 				'mail_title' 			=> 'NOTIFY',
 				'mail_subject' 			=> $subject,
 				'mail_sender_email' 	=> e107::getPref('replyto_email',$siteadminemail),

e107_handlers/phpmailer/class.pop3.php

@@ -34,18 +34,18 @@ class POP3
      * @type string
      * @access public
      */
-    public $Version = '5.2.9';
+    public $Version = '5.2.8';
 
     /**
      * Default POP3 port number.
-     * @type integer
+     * @type int
      * @access public
      */
     public $POP3_PORT = 110;
 
     /**
      * Default timeout in seconds.
-     * @type integer
+     * @type int
      * @access public
      */
     public $POP3_TIMEOUT = 30;
@@ -61,7 +61,7 @@ class POP3
     /**
      * Debug display level.
      * Options: 0 = no, 1+ = yes
-     * @type integer
+     * @type int
      * @access public
      */
     public $do_debug = 0;
@@ -75,14 +75,14 @@ class POP3
 
     /**
      * POP3 port number.
-     * @type integer
+     * @type int
      * @access public
      */
     public $port;
 
     /**
      * POP3 Timeout Value in seconds.
-     * @type integer
+     * @type int
      * @access public
      */
     public $tval;
@@ -110,32 +110,43 @@ class POP3
 
     /**
      * Are we connected?
-     * @type boolean
+     * @type bool
      * @access private
      */
-    private $connected = false;
+    private $connected;
 
     /**
      * Error container.
      * @type array
      * @access private
      */
-    private $errors = array();
+    private $error;
 
     /**
      * Line break constant
      */
     const CRLF = "\r\n";
 
+    /**
+     * Constructor.
+     * @access public
+     */
+    public function __construct()
+    {
+        $this->pop_conn = 0;
+        $this->connected = false;
+        $this->error = null;
+    }
+
     /**
      * Simple static wrapper for all-in-one POP before SMTP
      * @param $host
-     * @param boolean $port
+     * @param bool $port
-     * @param boolean $tval
+     * @param bool $tval
      * @param string $username
      * @param string $password
-     * @param integer $debug_level
+     * @param int $debug_level
-     * @return boolean
+     * @return bool
      */
     public static function popBeforeSmtp(
         $host,
@@ -154,34 +165,34 @@ class POP3
      * A connect, login, disconnect sequence
      * appropriate for POP-before SMTP authorisation.
      * @access public
-     * @param string $host The hostname to connect to
+     * @param string $host
-     * @param integer|boolean $port The port number to connect to
+     * @param bool|int $port
-     * @param integer|boolean $timeout The timeout value
+     * @param bool|int $tval
      * @param string $username
      * @param string $password
-     * @param integer $debug_level
+     * @param int $debug_level
-     * @return boolean
+     * @return bool
      */
-    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    public function authorise($host, $port = false, $tval = false, $username = '', $password = '', $debug_level = 0)
     {
         $this->host = $host;
         // If no port value provided, use default
         if ($port === false) {
             $this->port = $this->POP3_PORT;
         } else {
-            $this->port = (integer)$port;
+            $this->port = $port;
         }
         // If no timeout value provided, use default
-        if ($timeout === false) {
+        if ($tval === false) {
             $this->tval = $this->POP3_TIMEOUT;
         } else {
-            $this->tval = (integer)$timeout;
+            $this->tval = $tval;
         }
         $this->do_debug = $debug_level;
         $this->username = $username;
         $this->password = $password;
-        //  Reset the error log
+        //  Refresh the error log
-        $this->errors = array();
+        $this->error = null;
         //  connect
         $result = $this->connect($this->host, $this->port, $this->tval);
         if ($result) {
@@ -200,7 +211,7 @@ class POP3
      * Connect to a POP3 server.
      * @access public
      * @param string $host
-     * @param integer|boolean $port
+     * @param bool|int $port
      * @param integer $tval
      * @return boolean
      */
@@ -215,10 +226,6 @@ class POP3
         //Rather than suppress it with @fsockopen, capture it cleanly instead
         set_error_handler(array($this, 'catchWarning'));
 
-        if ($port === false) {
-            $port = $this->POP3_PORT;
-        }
-
         //  connect to the POP3 server
         $this->pop_conn = fsockopen(
             $host, //  POP3 Host
@@ -229,20 +236,34 @@ class POP3
         ); //  Timeout (seconds)
         //  Restore the error handler
         restore_error_handler();
-
+        //  Does the Error Log now contain anything?
+        if ($this->error && $this->do_debug >= 1) {
+            $this->displayErrors();
+        }
         //  Did we connect?
-        if ($this->pop_conn === false) {
+        if ($this->pop_conn == false) {
             //  It would appear not...
-            $this->setError(array(
+            $this->error = array(
                 'error' => "Failed to connect to server $host on port $port",
                 'errno' => $errno,
                 'errstr' => $errstr
-            ));
+            );
+            if ($this->do_debug >= 1) {
+                $this->displayErrors();
+            }
             return false;
         }
 
         //  Increase the stream time-out
+        //  Check for PHP 4.3.0 or later
+        if (version_compare(phpversion(), '5.0.0', 'ge')) {
             stream_set_timeout($this->pop_conn, $tval, 0);
+        } else {
+            //  Does not work on Windows
+            if (substr(PHP_OS, 0, 3) !== 'WIN') {
+                socket_set_timeout($this->pop_conn, $tval, 0);
+            }
+        }
 
         //  Get the POP3 server response
         $pop3_response = $this->getResponse();
@@ -265,8 +286,12 @@ class POP3
      */
     public function login($username = '', $password = '')
     {
-        if (!$this->connected) {
+        if ($this->connected == false) {
-            $this->setError('Not connected to POP3 server');
+            $this->error = 'Not connected to POP3 server';
+
+            if ($this->do_debug >= 1) {
+                $this->displayErrors();
+            }
         }
         if (empty($username)) {
             $username = $this->username;
@@ -298,11 +323,7 @@ class POP3
         $this->sendString('QUIT');
         //The QUIT command may cause the daemon to exit, which will kill our connection
         //So ignore errors here
-        try {
         @fclose($this->pop_conn);
-        } catch (Exception $e) {
-            //Do nothing
-        };
     }
 
     /**
@@ -348,11 +369,14 @@ class POP3
     private function checkResponse($string)
     {
         if (substr($string, 0, 3) !== '+OK') {
-            $this->setError(array(
+            $this->error = array(
                 'error' => "Server reported an error: $string",
                 'errno' => 0,
                 'errstr' => ''
-            ));
+            );
+            if ($this->do_debug >= 1) {
+                $this->displayErrors();
+            }
             return false;
         } else {
             return true;
@@ -360,21 +384,17 @@ class POP3
     }
 
     /**
-     * Add an error to the internal error store.
+     * Display errors if debug is enabled.
-     * Also display debug output if it's enabled.
+     * @access private
-     * @param $error
      */
-    private function setError($error)
+    private function displayErrors()
     {
-        $this->errors[] = $error;
-        if ($this->do_debug >= 1) {
         echo '<pre>';
-            foreach ($this->errors as $error) {
+        foreach ($this->error as $single_error) {
-                print_r($error);
+            print_r($single_error);
         }
         echo '</pre>';
     }
-    }
 
     /**
      * POP3 connection error handler.
@@ -386,12 +406,12 @@ class POP3
      */
     private function catchWarning($errno, $errstr, $errfile, $errline)
     {
-        $this->setError(array(
+        $this->error[] = array(
             'error' => "Connecting to the POP3 server raised a PHP warning: ",
             'errno' => $errno,
             'errstr' => $errstr,
             'errfile' => $errfile,
             'errline' => $errline
-        ));
+        );
     }
 }

e107_handlers/phpmailer/class.smtp.php

@@ -30,7 +30,7 @@ class SMTP
      * The PHPMailer SMTP version number.
      * @type string
      */
-    const VERSION = '5.2.9';
+    const VERSION = '5.2.8';
 
     /**
      * SMTP line break constant.
@@ -40,53 +40,28 @@ class SMTP
 
     /**
      * The SMTP port to use if one is not specified.
-     * @type integer
+     * @type int
      */
     const DEFAULT_SMTP_PORT = 25;
 
     /**
      * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
+     * @type int
      */
     const MAX_LINE_LENGTH = 998;
 
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
     /**
      * The PHPMailer SMTP Version number.
      * @type string
-     * @deprecated Use the `VERSION` constant instead
+     * @deprecated Use the constant instead
      * @see SMTP::VERSION
      */
-    public $Version = '5.2.9';
+    public $Version = '5.2.8';
 
     /**
      * SMTP server port number.
-     * @type integer
+     * @type int
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+     * @deprecated This is only ever used as a default value, so use the constant instead
      * @see SMTP::DEFAULT_SMTP_PORT
      */
     public $SMTP_PORT = 25;
@@ -94,7 +69,7 @@ class SMTP
     /**
      * SMTP reply line ending.
      * @type string
-     * @deprecated Use the `CRLF` constant instead
+     * @deprecated Use the constant instead
      * @see SMTP::CRLF
      */
     public $CRLF = "\r\n";
@@ -102,27 +77,22 @@ class SMTP
     /**
      * Debug output level.
      * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * `0` No output
-     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * `1` Commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * `2` Data and commands
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * `3` As 2 plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+     * * `4` Low-level data output
-     * @type integer
+     * @type int
      */
-    public $do_debug = self::DEBUG_OFF;
+    public $do_debug = 0;
 
     /**
      * How to handle debug output.
      * Options:
      * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `html` Output escaped, line breaks converted to <br>, appropriate for browser output
      * * `error_log` Output to error log as configured in php.ini
-     *
+     * @type string
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
      */
     public $Debugoutput = 'echo';
 
@@ -130,7 +100,7 @@ class SMTP
      * Whether to use VERP.
      * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
      * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @type boolean
+     * @type bool
      */
     public $do_verp = false;
 
@@ -139,16 +109,15 @@ class SMTP
      * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
      * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
      * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @type integer
+     * @type int
      */
     public $Timeout = 300;
 
     /**
-     * How long to wait for commands to complete, in seconds.
+     * The SMTP timelimit value for reads, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @type int
-     * @type integer
      */
-    public $Timelimit = 300;
+    public $Timelimit = 30;
 
     /**
      * The socket for the server connection.
@@ -158,16 +127,15 @@ class SMTP
 
     /**
      * Error message, if any, for the last call.
-     * @type array
+     * @type string
      */
-    protected $error = array();
+    protected $error = '';
 
     /**
      * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
+     * @type string
-     * @type string|null
      */
-    protected $helo_rply = null;
+    protected $helo_rply = '';
 
     /**
      * The most recent reply received from the server.
@@ -175,23 +143,25 @@ class SMTP
      */
     protected $last_reply = '';
 
+    /**
+     * Constructor.
+     * @access public
+     */
+    public function __construct()
+    {
+        $this->smtp_conn = 0;
+        $this->error = null;
+        $this->helo_rply = null;
+        $this->do_debug = 0;
+    }
+
     /**
      * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
      * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
      * @return void
      */
-    protected function edebug($str, $level = 0)
+    protected function edebug($str)
     {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        if (is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
         switch ($this->Debugoutput) {
             case 'error_log':
                 //Don't output, just log
@@ -208,35 +178,23 @@ class SMTP
                 break;
             case 'echo':
             default:
-                //Normalize line breaks
+                echo gmdate('Y-m-d H:i:s')."\t".trim($str)."\n";
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
         }
     }
 
     /**
      * Connect to an SMTP server.
      * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
+     * @param int $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
+     * @param int $timeout How long to wait for the connection to open
      * @param array $options An array of options for stream_context_create()
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function connect($host, $port = null, $timeout = 30, $options = array())
     {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
         // Clear errors to avoid confusion
-        $this->error = array();
+        $this->error = null;
         // Make sure we are __not__ connected
         if ($this->connected()) {
             // Already connected, generate error
@@ -247,13 +205,11 @@ class SMTP
             $port = self::DEFAULT_SMTP_PORT;
         }
         // Connect to the SMTP server
-        $this->edebug(
+        if ($this->do_debug >= 3) {
-            "Connection: opening to $host:$port, t=$timeout, opt=".var_export($options, true),
+            $this->edebug('Connection: opening');
-            self::DEBUG_CONNECTION
+        }
-        );
         $errno = 0;
         $errstr = '';
-        if ($streamok) {
         $socket_context = stream_context_create($options);
         //Suppress errors; connection failures are handled at a higher level
         $this->smtp_conn = @stream_socket_client(
@@ -264,35 +220,24 @@ class SMTP
             STREAM_CLIENT_CONNECT,
             $socket_context
         );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
         // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
+        if (empty($this->smtp_conn)) {
             $this->error = array(
                 'error' => 'Failed to connect to server',
                 'errno' => $errno,
                 'errstr' => $errstr
             );
+            if ($this->do_debug >= 1) {
                 $this->edebug(
                     'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
+                    . ": $errstr ($errno)"
-                self::DEBUG_CLIENT
                 );
+            }
             return false;
         }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        if ($this->do_debug >= 3) {
+            $this->edebug('Connection: opened');
+        }
         // SMTP server can take longer to respond, give longer timeout for first read
         // Windows does not have support for this timeout function
         if (substr(PHP_OS, 0, 3) != 'WIN') {
@@ -304,14 +249,16 @@ class SMTP
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        if ($this->do_debug >= 2) {
+            $this->edebug('SERVER -> CLIENT: ' . $announce);
+        }
         return true;
     }
 
     /**
      * Initiate a TLS (encrypted) session.
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function startTLS()
     {
@@ -339,7 +286,7 @@ class SMTP
      * @param string $realm       The auth realm for NTLM
      * @param string $workstation The auth workstation for NTLM
      * @access public
-     * @return boolean True if successfully authenticated.
+     * @return bool True if successfully authenticated.
      */
     public function authenticate(
         $username,
@@ -394,11 +341,12 @@ class SMTP
                 //Check that functions are available
                 if (!$ntlm_client->Initialize($temp)) {
                     $this->error = array('error' => $temp->error);
+                    if ($this->do_debug >= 1) {
                         $this->edebug(
                             'You need to enable some modules in your php.ini file: '
-                        . $this->error['error'],
+                            . $this->error['error']
-                        self::DEBUG_CLIENT
                         );
+                    }
                     return false;
                 }
                 //msg1
@@ -429,6 +377,7 @@ class SMTP
                 );
                 // send encoded username
                 return $this->sendCommand('Username', base64_encode($msg3), 235);
+                break;
             case 'CRAM-MD5':
                 // Start authentication
                 if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
@@ -442,6 +391,7 @@ class SMTP
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
+                break;
         }
         return true;
     }
@@ -467,7 +417,7 @@ class SMTP
         // RFC 2104 HMAC implementation for php.
         // Creates an md5 HMAC.
         // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
+        // Hacked by Lance Rushing
 
         $bytelen = 64; // byte length for md5
         if (strlen($key) > $bytelen) {
@@ -485,18 +435,19 @@ class SMTP
     /**
      * Check connection state.
      * @access public
-     * @return boolean True if connected.
+     * @return bool True if connected.
      */
     public function connected()
     {
-        if (is_resource($this->smtp_conn)) {
+        if (!empty($this->smtp_conn)) {
             $sock_status = stream_get_meta_data($this->smtp_conn);
             if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
+                // the socket is valid but we are not connected
+                if ($this->do_debug >= 1) {
                     $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
+                        'SMTP NOTICE: EOF caught while checking if connected'
-                    self::DEBUG_CLIENT
                     );
+                }
                 $this->close();
                 return false;
             }
@@ -514,13 +465,15 @@ class SMTP
      */
     public function close()
     {
-        $this->error = array();
+        $this->error = null; // so there is no confusion
         $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
+        if (!empty($this->smtp_conn)) {
             // close the connection and cleanup
             fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
+            if ($this->do_debug >= 3) {
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+                $this->edebug('Connection: closed');
+            }
+            $this->smtp_conn = 0;
         }
     }
 
@@ -534,15 +487,13 @@ class SMTP
      * Implements rfc 821: DATA <CRLF>
      * @param string $msg_data Message data to send
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function data($msg_data)
     {
-        //This will use the standard timelimit
         if (!$this->sendCommand('DATA', 'DATA', 354)) {
             return false;
         }
-
         /* The server is ready to accept data!
          * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
          * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
@@ -570,7 +521,7 @@ class SMTP
             if ($in_headers and $line == '') {
                 $in_headers = false;
             }
-            //We need to break this line up into several smaller lines
+            // ok we need to break this line up into several smaller lines
             //This is a small micro-optimisation: isset($str[$len]) is equivalent to (strlen($str) > $len)
             while (isset($line[self::MAX_LINE_LENGTH])) {
                 //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
@@ -587,14 +538,16 @@ class SMTP
                     //Move along by the amount we dealt with
                     $line = substr($line, $pos + 1);
                 }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                /* If processing headers add a LWSP-char to the front of new line
+                 * RFC822 section 3.1.1
+                 */
                 if ($in_headers) {
                     $line = "\t" . $line;
                 }
             }
             $lines_out[] = $line;
 
-            //Send the lines to the server
+            // Send the lines to the server
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
                 if (!empty($line_out) and $line_out[0] == '.') {
@@ -604,14 +557,8 @@ class SMTP
             }
         }
 
-        //Message data has been sent, complete the command
+        // Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
+        return $this->sendCommand('DATA END', '.', 250);
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
     }
 
     /**
@@ -622,12 +569,12 @@ class SMTP
      * and RFC 2821 EHLO.
      * @param string $host The host name or IP to connect to
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function hello($host = '')
     {
-        //Try extended hello first (RFC 2821)
+        // Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+        return (bool)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -637,7 +584,7 @@ class SMTP
      * @param string $hello The HELO string
      * @param string $host The hostname to say we are
      * @access protected
-     * @return boolean
+     * @return bool
      */
     protected function sendHello($hello, $host)
     {
@@ -655,7 +602,7 @@ class SMTP
      * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
      * @param string $from Source address of this message
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function mail($from)
     {
@@ -671,9 +618,9 @@ class SMTP
      * Send an SMTP QUIT command.
      * Closes the socket if there is no error or the $close_on_error argument is true.
      * Implements from rfc 821: QUIT <CRLF>
-     * @param boolean $close_on_error Should the connection close if an error occurs?
+     * @param bool $close_on_error Should the connection close if an error occurs?
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function quit($close_on_error = true)
     {
@@ -693,7 +640,7 @@ class SMTP
      * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
      * @param string $toaddr The address the message is being sent to
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function recipient($toaddr)
     {
@@ -709,7 +656,7 @@ class SMTP
      * Abort any transaction that is currently in progress.
      * Implements rfc 821: RSET <CRLF>
      * @access public
-     * @return boolean True on success.
+     * @return bool True on success.
      */
     public function reset()
     {
@@ -720,9 +667,9 @@ class SMTP
      * Send a command to an SMTP server and check its return code.
      * @param string $command       The command name - not sent to the server
      * @param string $commandstring The actual command to send
-     * @param integer|array $expect     One or more expected integer success codes
+     * @param int|array $expect     One or more expected integer success codes
      * @access protected
-     * @return boolean True on success.
+     * @return bool True on success.
      */
     protected function sendCommand($command, $commandstring, $expect)
     {
@@ -734,25 +681,30 @@ class SMTP
         }
         $this->client_send($commandstring . self::CRLF);
 
-        $this->last_reply = $this->get_lines();
+        $reply = $this->get_lines();
-        $code = substr($this->last_reply, 0, 3);
+        $code = substr($reply, 0, 3);
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        if ($this->do_debug >= 2) {
+            $this->edebug('SERVER -> CLIENT: ' . $reply);
+        }
 
         if (!in_array($code, (array)$expect)) {
+            $this->last_reply = null;
             $this->error = array(
                 'error' => "$command command failed",
                 'smtp_code' => $code,
-                'detail' => substr($this->last_reply, 4)
+                'detail' => substr($reply, 4)
             );
+            if ($this->do_debug >= 1) {
                 $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                    'SMTP ERROR: ' . $this->error['error'] . ': ' . $reply
-                self::DEBUG_CLIENT
                 );
+            }
             return false;
         }
 
-        $this->error = array();
+        $this->last_reply = $reply;
+        $this->error = null;
         return true;
     }
 
@@ -767,7 +719,7 @@ class SMTP
      * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
      * @param string $from The address the message is from
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function sendAndMail($from)
     {
@@ -778,7 +730,7 @@ class SMTP
      * Send an SMTP VRFY command.
      * @param string $name The name to verify
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function verify($name)
     {
@@ -789,7 +741,7 @@ class SMTP
      * Send an SMTP NOOP command.
      * Used to keep keep-alives alive, doesn't actually do anything
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function noop()
     {
@@ -803,14 +755,16 @@ class SMTP
      * and _may_ be implemented in future
      * Implements from rfc 821: TURN <CRLF>
      * @access public
-     * @return boolean
+     * @return bool
      */
     public function turn()
     {
         $this->error = array(
             'error' => 'The SMTP TURN command is not implemented'
         );
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        if ($this->do_debug >= 1) {
+            $this->edebug('SMTP NOTICE: ' . $this->error['error']);
+        }
         return false;
     }
 
@@ -818,11 +772,13 @@ class SMTP
      * Send raw data to the server.
      * @param string $data The data to send
      * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
+     * @return int|bool The number of bytes sent to the server or false on error
      */
     public function client_send($data)
     {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+        if ($this->do_debug >= 1) {
+            $this->edebug("CLIENT -> SERVER: $data");
+        }
         return fwrite($this->smtp_conn, $data);
     }
 
@@ -869,10 +825,14 @@ class SMTP
         }
         while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
             $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
+            if ($this->do_debug >= 4) {
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
+                $this->edebug("SMTP -> get_lines(): \$data was \"$data\"");
+                $this->edebug("SMTP -> get_lines(): \$str is \"$str\"");
+            }
             $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+            if ($this->do_debug >= 4) {
+                $this->edebug("SMTP -> get_lines(): \$data is \"$data\"");
+            }
             // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
             if ((isset($str[3]) and $str[3] == ' ')) {
                 break;
@@ -880,19 +840,21 @@ class SMTP
             // Timed-out? Log and break
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
+                if ($this->do_debug >= 4) {
                     $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                        'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)'
-                    self::DEBUG_LOWLEVEL
                     );
+                }
                 break;
             }
             // Now check if reads took too long
             if ($endtime and time() > $endtime) {
+                if ($this->do_debug >= 4) {
                     $this->edebug(
                         'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
+                        $this->Timelimit . ' sec)'
-                    self::DEBUG_LOWLEVEL
                     );
+                }
                 break;
             }
         }
@@ -901,7 +863,7 @@ class SMTP
 
     /**
      * Enable or disable VERP address generation.
-     * @param boolean $enabled
+     * @param bool $enabled
      */
     public function setVerp($enabled = false)
     {
@@ -910,7 +872,7 @@ class SMTP
 
     /**
      * Get VERP address generation mode.
-     * @return boolean
+     * @return bool
      */
     public function getVerp()
     {
@@ -919,7 +881,7 @@ class SMTP
 
     /**
      * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+     * @param string $method The function/method to use for debugging output.
      */
     public function setDebugOutput($method = 'echo')
     {
@@ -937,7 +899,7 @@ class SMTP
 
     /**
      * Set debug output level.
-     * @param integer $level
+     * @param int $level
      */
     public function setDebugLevel($level = 0)
     {
@@ -946,7 +908,7 @@ class SMTP
 
     /**
      * Get debug output level.
-     * @return integer
+     * @return int
      */
     public function getDebugLevel()
     {
@@ -955,7 +917,7 @@ class SMTP
 
     /**
      * Set SMTP timeout.
-     * @param integer $timeout
+     * @param int $timeout
      */
     public function setTimeout($timeout = 0)
     {
@@ -964,7 +926,7 @@ class SMTP
 
     /**
      * Get SMTP timeout.
-     * @return integer
+     * @return int
      */
     public function getTimeout()
     {

e107_handlers/user_handler.php

@@ -832,7 +832,7 @@ Following fields auto-filled in code as required:
 	 */
 	public function userStatusUpdate($action, $uid, $emailAddress = '')
 	{
-		$db = e107::getDb();
+		$db = e107::getDb('user');
 		$qry = '';
 		$error = FALSE;				// Assume no error to start with
 		$uid = intval($uid);		// Precautionary - should have already been done

e107_languages/English/admin/help/mailout.php

@@ -49,7 +49,7 @@ $action = e107::getParser()->toDB(varset($_GET['mode'],'makemail'));
 		break;
 	case 'prefs' :
 	  $text = '<b>Configure mailshot options.</b><br />
-	  A test email is sent using the current method and settings.<br /><br />';
+	  A test email is sent using the current method and settings. If you are having problems with emails bouncing, try sending a test email to: <i>check-auth@verifier.port25.com</i> to ensure your server MX records are correct. Of course, be sure your site email address is correct before doing so.<br /><br />';
 	  $text .= '<b>Emailing Method</b><br />
 	  Use SMTP to send mail if possible. The settings will depend on your host\'s mail server.<br /><br />';
 	  $text .= '<b>Default email format</b><br />
@@ -57,7 +57,7 @@ $action = e107::getParser()->toDB(varset($_GET['mode'],'makemail'));
 	  security measures. If you select HTML, a separate plain text part is added.<br /><br />';
 	  $text .= '<b>Bulk mail controls</b><br />
 	  The values you set here will depend on your host, and on the number of emails you send; it may be possible to set all values to zero so that the
-	  mail queue is emptied virtually instantly.<br /><br />';
+	  mail queue is emptied virtually instantly. Typically it is best to send less than 500 emails per hour.<br /><br />';
 	  $text .= '<b>Bounced Emails</b><br />
 	  You can specify an email address to receive the return response when an email is undeliverable. If you have control over your server, you can specify the
 	  separate scheduler-driven auto-processing script; this receives bounce messages as they arrive, and updates status instantly. Otherwise you can specify a separate email account,