/branches/2.8.x/wb/include/phpmailer/class.pop3.php - Diff - WB 2.08.x - Tracking

« Previous | Next »

Revision 1539

Added by Dietmar almost 13 years ago

update phpmailer to version 5.1

     /*~ class.pop3.php
     .---------------------------------------------------------------------------.
     |  Software: PHPMailer - PHP email class                                    |
     |   Version: 2.0.4                                                          |
     |   Version: 5.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.               |
     |     Admin: Andy Prevost (project admininistrator)                         |
     |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
     |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
     |   Founder: Brent R. Matzelle (original founder)                           |
     | Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
     | Copyright (c) 2001-2003, Brent R. Matzelle                                |
     | ------------------------------------------------------------------------- |
     |   License: Distributed under the Lesser General Public License (LGPL)     |
-...
     | - Technology Consulting                                                   |
     | - Oursourcing (highly qualified programmers and graphic designers)        |
     '---------------------------------------------------------------------------'
     */
     /**
      * PHPMailer - PHP POP Before SMTP Authentication Class
      * NOTE: Designed for use with PHP version 5 and up
      * @package PHPMailer
      * @author Andy Prevost
      * @author Marcus Bointon
      * @copyright 2004 - 2009 Andy Prevost
      * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
      * @version $Id: class.pop3.php 444 2009-05-05 11:22:26Z coolbru $
      */
     /**
      * POP Before SMTP Authentication Class
      * Version 5.0.0
+     *
      * Author: Richard Davey (rich@corephp.co.uk)
      * Modifications: Andy Prevost
      * License: LGPL, see PHPMailer License
+     *
      * Specifically for PHPMailer to allow POP before SMTP authentication.
      * Does not yet work with APOP - if you have an APOP account, contact me
      * Does not yet work with APOP - if you have an APOP account, contact Richard Davey
      * and we can test changes to this script.
+     *
      * This class is based on the structure of the SMTP class by Chris Ryan
      * This class is based on the structure of the SMTP class originally authored by Chris Ryan
+     *
      * This class is rfc 1939 compliant and implements all the commands
      * required for POP3 connection, authentication and disconnection.
-...
      * @author Richard Davey
      */
     class POP3
+    {
     class POP3 {
       /**
        * Default POP3 port
       * @var int
        * @var int
        */
       var $POP3_PORT = 110;
       public $POP3_PORT = 110;
       /**
        * Default Timeout
       * @var int
        * @var int
        */
       var $POP3_TIMEOUT = 30;
       public $POP3_TIMEOUT = 30;
       /**
        * POP3 Carriage Return + Line Feed
       * @var string
        * @var string
        */
       var $CRLF = "\r\n";
       public $CRLF = "\r\n";
       /**
        * Displaying Debug warnings? (0 = now, 1+ = yes)
       * @var int
        * @var int
        */
       var $do_debug = 2;
       public $do_debug = 2;
       /**
        * POP3 Mail Server
       * @var string
        * @var string
        */
       var $host;
       public $host;
       /**
        * POP3 Port
       * @var int
        * @var int
        */
       var $port;
       public $port;
       /**
        * POP3 Timeout Value
       * @var int
        * @var int
        */
       var $tval;
       public $tval;
       /**
        * POP3 Username
       * @var string
        * @var string
        */
       var $username;
       public $username;
       /**
        * POP3 Password
       * @var string
        * @var string
        */
       var $password;
       public $password;
       /**#@+
       * @access private
        */
       var $pop_conn;
       var $connected;
       var $error;     //  Error log array
       /**#@-*/
       /////////////////////////////////////////////////
       // PROPERTIES, PRIVATE AND PROTECTED
       /////////////////////////////////////////////////
       private $pop_conn;
       private $connected;
       private $error;     //  Error log array
       /**
        * Constructor, sets the initial values
+       *
       * @return POP3
        * @access public
        * @return POP3
        */
       function POP3 ()
+        {
           $this->pop_conn = 0;
           $this->connected = false;
           $this->error = null;
+        }
       public function __construct() {
         $this->pop_conn  = 0;
         $this->connected = false;
         $this->error     = null;
+      }
       /**
        * Combination of public events - connect, login, disconnect
+       *
       * @param string $host
       * @param integer $port
       * @param integer $tval
       * @param string $username
       * @param string $password
        * @access public
        * @param string $host
        * @param integer $port
        * @param integer $tval
        * @param string $username
        * @param string $password
        */
       function Authorise ($host, $port = false, $tval = 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 is passed, retrieve it
         if ($port == false)
+        {
         if ($port == false) {
           $this->port = $this->POP3_PORT;
+        }
         else
+        {
         } else {
           $this->port = $port;
+        }
         //  If no port value is passed, retrieve it
         if ($tval == false)
+        {
         if ($tval == false) {
           $this->tval = $this->POP3_TIMEOUT;
+        }
         else
+        {
         } else {
           $this->tval = $tval;
+        }
-...
         $this->password = $password;
         //  Refresh the error log
           $this->error = null;
         $this->error = null;
           //  Connect
         //  Connect
         $result = $this->Connect($this->host, $this->port, $this->tval);
         if ($result)
+        {
         if ($result) {
           $login_result = $this->Login($this->username, $this->password);
           if ($login_result)
+          {
           if ($login_result) {
             $this->Disconnect();
             return true;
-...
       /**
        * Connect to the POP3 server
+       *
       * @param string $host
       * @param integer $port
       * @param integer $tval
       * @return boolean
        * @access public
        * @param string $host
        * @param integer $port
        * @param integer $tval
        * @return boolean
        */
       function Connect ($host, $port = false, $tval = 30)
+        {
       public function Connect ($host, $port = false, $tval = 30) {
         //  Are we already connected?
         if ($this->connected)
+        {
         if ($this->connected) {
           return true;
+        }
         /*
           On Windows this will raise a PHP Warning error if the hostname doesn't exist.
           Rather than supress it with @fsockopen, let's capture it cleanly instead
         On Windows this will raise a PHP Warning error if the hostname doesn't exist.
         Rather than supress it with @fsockopen, let's capture it cleanly instead
         */
         set_error_handler(array(&$this, 'catchWarning'));
-...
         restore_error_handler();
         //  Does the Error Log now contain anything?
         if ($this->error && $this->do_debug >= 1)
+        {
             $this->displayErrors();
         if ($this->error && $this->do_debug >= 1) {
           $this->displayErrors();
+        }
         //  Did we connect?
           if ($this->pop_conn == false)
+          {
             //  It would appear not...
             $this->error = array(
               'error' => "Failed to connect to server $host on port $port",
               'errno' => $errno,
               'errstr' => $errstr
             );
         if ($this->pop_conn == false) {
           //  It would appear not...
           $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;
           if ($this->do_debug >= 1) {
             $this->displayErrors();
+          }
           //  Increase the stream time-out
           return false;
+        }
           //  Check for PHP 4.3.0 or later
           if (version_compare(phpversion(), '4.3.0', 'ge'))
+          {
             stream_set_timeout($this->pop_conn, $tval, 0);
         //  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);
+          }
           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();
         $pop3_response = $this->getResponse();
           //  Check for the +OK
           if ($this->checkResponse($pop3_response))
+          {
           //  The connection is established and the POP3 server is talking
           $this->connected = true;
             return true;
+          }
         //  Check for the +OK
         if ($this->checkResponse($pop3_response)) {
         //  The connection is established and the POP3 server is talking
         $this->connected = true;
           return true;
+        }
         /**
          * Login to the POP3 server (does not support APOP yet)
+         *
         * @param string $username
         * @param string $password
         * @return boolean
          */
         function Login ($username = '', $password = '')
+        {
           if ($this->connected == false)
+          {
             $this->error = 'Not connected to POP3 server';
+      }
             if ($this->do_debug >= 1)
+            {
               $this->displayErrors();
+            }
+          }
       /**
        * Login to the POP3 server (does not support APOP yet)
        * @access public
        * @param string $username
        * @param string $password
        * @return boolean
        */
       public function Login ($username = '', $password = '') {
         if ($this->connected == false) {
           $this->error = 'Not connected to POP3 server';
           if (empty($username))
+          {
             $username = $this->username;
           if ($this->do_debug >= 1) {
             $this->displayErrors();
+          }
+        }
           if (empty($password))
+          {
             $password = $this->password;
+          }
         if (empty($username)) {
           $username = $this->username;
+        }
         if (empty($password)) {
           $password = $this->password;
+        }
         $pop_username = "USER $username" . $this->CRLF;
         $pop_password = "PASS $password" . $this->CRLF;
           //  Send the Username
           $this->sendString($pop_username);
         //  Send the Username
         $this->sendString($pop_username);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
           //  Send the Password
           $this->sendString($pop_password);
           $pop3_response = $this->getResponse();
           if ($this->checkResponse($pop3_response))
+          {
             //  Send the Password
             $this->sendString($pop_password);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response))
+            {
               return true;
+            }
             else
+            {
               return false;
+            }
+          }
           else
+          {
           if ($this->checkResponse($pop3_response)) {
             return true;
           } else {
             return false;
+          }
         } else {
           return false;
+        }
+      }
         /**
          * Disconnect from the POP3 server
          */
         function Disconnect ()
+        {
           $this->sendString('QUIT');
       /**
        * Disconnect from the POP3 server
        * @access public
        */
       public function Disconnect () {
         $this->sendString('QUIT');
           fclose($this->pop_conn);
+        }
         fclose($this->pop_conn);
+      }
         /*
           ---------------
           Private Methods
           ---------------
         */
       /////////////////////////////////////////////////
       //  Private Methods
       /////////////////////////////////////////////////
         /**
          * Get the socket response back.
          * $size is the maximum number of bytes to retrieve
+         *
         * @param integer $size
         * @return string
          */
         function getResponse ($size = 128)
+        {
           $pop3_response = fgets($this->pop_conn, $size);
       /**
        * Get the socket response back.
        * $size is the maximum number of bytes to retrieve
        * @access private
        * @param integer $size
        * @return string
        */
       private function getResponse ($size = 128) {
         $pop3_response = fgets($this->pop_conn, $size);
           return $pop3_response;
+        }
         return $pop3_response;
+      }
         /**
          * Send a string down the open socket connection to the POP3 server
+         *
         * @param string $string
         * @return integer
          */
         function sendString ($string)
+        {
           $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
       /**
        * Send a string down the open socket connection to the POP3 server
        * @access private
        * @param string $string
        * @return integer
        */
       private function sendString ($string) {
         $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
           return $bytes_sent;
         return $bytes_sent;
+      }
+        }
       /**
        * Checks the POP3 server response for +OK or -ERR
        * @access private
        * @param string $string
        * @return boolean
        */
       private function checkResponse ($string) {
         if (substr($string, 0, 3) !== '+OK') {
           $this->error = array(
             'error' => "Server reported an error: $string",
             'errno' => 0,
             'errstr' => ''
           );
         /**
          * Checks the POP3 server response for +OK or -ERR
+         *
         * @param string $string
         * @return boolean
          */
         function checkResponse ($string)
+        {
           if (substr($string, 0, 3) !== '+OK')
+          {
             $this->error = array(
               'error' => "Server reported an error: $string",
               'errno' => 0,
               'errstr' => ''
             );
             if ($this->do_debug >= 1)
+            {
               $this->displayErrors();
+            }
             return false;
           if ($this->do_debug >= 1) {
             $this->displayErrors();
+          }
           else
+          {
             return true;
+          }
           return false;
         } else {
           return true;
+        }
         /**
          * If debug is enabled, display the error message array
+         *
          */
         function displayErrors ()
+        {
           echo '<pre>';
+      }
           foreach ($this->error as $single_error)
+        {
             print_r($single_error);
+        }
       /**
        * If debug is enabled, display the error message array
        * @access private
        */
       private function displayErrors () {
         echo '<pre>';
           echo '</pre>';
         foreach ($this->error as $single_error) {
           print_r($single_error);
+        }
         echo '</pre>';
+      }
       /**
        * Takes over from PHP for the socket warning handler
+       *
       * @param integer $errno
       * @param string $errstr
       * @param string $errfile
       * @param integer $errline
        * @access private
        * @param integer $errno
        * @param string $errstr
        * @param string $errfile
        * @param integer $errline
        */
       function catchWarning ($errno, $errstr, $errfile, $errline)
+      {
       private function catchWarning ($errno, $errstr, $errfile, $errline) {
         $this->error[] = array(
           'error' => "Connecting to the POP3 server raised a PHP warning: ",
           'errno' => $errno,
-...
       //  End of class
+    }
     ?>
     ?>

Also available in: Unified diff

Project

General

Profile

WB 2.08.x

Revision 1539

Added by Dietmar almost 13 years ago