Inspection of "Merge pull request #1556 from jloguercio/1.10.x" - chamilo/chamilo-lms - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 1.10.x ( 9d3ef5...048bd3 )

by José

created 2016-12-14 23:41 UTC

Status

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.csv');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 
         DocumentManager::file_send_for_download($filePath, true, $filename.'.xlsx');
         exit;
-	}
+    }
 
     /**
      * Export tabular data to XLS-file (as html table)
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
     }
 
     /**
-    * Export tabular data to XML-file
-    * @param array  Simple array of data to put in XML
-    * @param string Name of file to be given to the user
-    * @param string Name of common tag to place each line in
-    * @param string Name of the root element. A root element should always be given.
-    * @param string Encoding in which the data is provided
-    */
+     * Export tabular data to XML-file
+     * @param array  Simple array of data to put in XML
+     * @param string Name of file to be given to the user
+     * @param string Name of common tag to place each line in
+     * @param string Name of the root element. A root element should always be given.
+     * @param string Encoding in which the data is provided
+     */
     public static function arrayToXml(
         $data,
         $filename = 'export',
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
         fclose($handle);
         DocumentManager :: file_send_for_download($file, true, $filename.'.xml');
         exit;
-	}
+    }
 
     /**
      * Export hierarchical tabular data to XML-file
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
         foreach ($data as $row) {
             $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
+                $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
                 $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];

Please login to merge, or discard this patch.

main/inc/lib/browser/Browser.php 1 patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -256,9 +256,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * Is the browser from facebook?
-    * @return boolean True if the browser is from facebook otherwise false
-    */
+     * Is the browser from facebook?
+     * @return boolean True if the browser is from facebook otherwise false
+     */
     public function isFacebook() 
     { 
         return $this->_is_facebook;
@@ -591,12 +591,12 @@  discard block
 block discarded – undo
             }
             return true;
         } // Test for versions > IE 10
-		else if(stripos($this->_agent, 'trident') !== false) {
-			$this->setBrowser(self::BROWSER_IE);
-			$result = explode('rv:', $this->_agent);
-			$this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
-			$this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
-		} // Test for Pocket IE
+        else if(stripos($this->_agent, 'trident') !== false) {
+            $this->setBrowser(self::BROWSER_IE);
+            $result = explode('rv:', $this->_agent);
+            $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
+            $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
+        } // Test for Pocket IE
         else if (stripos($this->_agent, 'mspie') !== false || stripos($this->_agent, 'pocket') !== false) {
             $aresult = explode(' ', stristr($this->_agent, 'mspie'));
             $this->setPlatform(self::PLATFORM_WINDOWS_CE);

Please login to merge, or discard this patch.

main/inc/lib/certificate.lib.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -144,8 +144,8 @@  discard block
 block discarded – undo
     }
 
     /**
-    *  Generates an HTML Certificate and fills the path_certificate field in the DB
-    **/
+     *  Generates an HTML Certificate and fills the path_certificate field in the DB
+     **/
     public function generate($params = array())
     {
         // The user directory should be set
@@ -261,12 +261,12 @@  discard block
 block discarded – undo
     }
 
     /**
-    * update user info about certificate
-    * @param int $cat_id category id
-    * @param int $user_id user id
-    * @param string $path_certificate the path name of the certificate
-    * @return void()
-    */
+     * update user info about certificate
+     * @param int $cat_id category id
+     * @param int $user_id user id
+     * @param string $path_certificate the path name of the certificate
+     * @return void()
+     */
     public function update_user_info_about_certificate(
         $cat_id,
         $user_id,
@@ -368,13 +368,13 @@  discard block
 block discarded – undo
     }
 
     /**
-    * Shows the student's certificate (HTML file). If the global setting
-    * allow_public_certificates is set to 'false', no certificate can be printed.
-    * If the global allow_public_certificates is set to 'true' and the course
-    * setting allow_public_certificates is set to 0, no certificate *in this
-    * course* can be printed (for anonymous users). Connected users can always
-    * print them.
-    */
+     * Shows the student's certificate (HTML file). If the global setting
+     * allow_public_certificates is set to 'false', no certificate can be printed.
+     * If the global allow_public_certificates is set to 'true' and the course
+     * setting allow_public_certificates is set to 0, no certificate *in this
+     * course* can be printed (for anonymous users). Connected users can always
+     * print them.
+     */
     public function show()
     {
         // Special rules for anonymous users

Please login to merge, or discard this patch.

main/inc/lib/phpmailer/class.smtp.php 1 patch

Indentation +429 added lines, -429 removed lines patch added patch discarded remove patch

@@ -47,130 +47,130 @@  discard block
 block discarded – undo
  */
 
 class SMTP {
-  /**
-   *  SMTP server port
-   *  @var int
-   */
-  public $SMTP_PORT = 25;
-
-  /**
-   *  SMTP reply line ending
-   *  @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   *  Sets whether debugging is turned on
-   *  @var bool
-   */
-  public $do_debug;       // the level of debug to perform
-
-  /**
-   *  Sets VERP use on/off (default is off)
-   *  @var bool
-   */
-  public $do_verp = false;
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  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
-
-  /**
-   * Initialize the class so that the data is in a known state.
-   * @access public
-   * @return void
-   */
-  public function __construct() {
+    /**
+     *  SMTP server port
+     *  @var int
+     */
+    public $SMTP_PORT = 25;
+
+    /**
+     *  SMTP reply line ending
+     *  @var string
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     *  Sets whether debugging is turned on
+     *  @var bool
+     */
+    public $do_debug;       // the level of debug to perform
+
+    /**
+     *  Sets VERP use on/off (default is off)
+     *  @var bool
+     */
+    public $do_verp = false;
+
+    /////////////////////////////////////////////////
+    // PROPERTIES, PRIVATE AND PROTECTED
+    /////////////////////////////////////////////////
+
+    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
+
+    /**
+     * Initialize the class so that the data is in a known state.
+     * @access public
+     * @return void
+     */
+    public function __construct() {
     $this->smtp_conn = 0;
     $this->error = null;
     $this->helo_rply = null;
 
     $this->do_debug = 0;
-  }
-
-  /////////////////////////////////////////////////
-  // CONNECTION FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Connect to the server specified on the port specified.
-   * If the port is not specified use the default SMTP_PORT.
-   * If tval is specified then a connection will try and be
-   * established with the server for that number of seconds.
-   * If tval is not specified the default is 30 seconds to
-   * try on the connection.
-   *
-   * SMTP CODE SUCCESS: 220
-   * SMTP CODE FAILURE: 421
-   * @access public
-   * @return bool
-   */
-  public function Connect($host, $port = 0, $tval = 30) {
+    }
+
+    /////////////////////////////////////////////////
+    // CONNECTION FUNCTIONS
+    /////////////////////////////////////////////////
+
+    /**
+     * Connect to the server specified on the port specified.
+     * If the port is not specified use the default SMTP_PORT.
+     * If tval is specified then a connection will try and be
+     * established with the server for that number of seconds.
+     * If tval is not specified the default is 30 seconds to
+     * try on the connection.
+     *
+     * SMTP CODE SUCCESS: 220
+     * SMTP CODE FAILURE: 421
+     * @access public
+     * @return bool
+     */
+    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
     if($this->connected()) {
-      // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
-      return false;
+        // already connected, generate error
+        $this->error = array("error" => "Already connected to a server");
+        return false;
     }
 
     if(empty($port)) {
-      $port = $this->SMTP_PORT;
+        $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
+                                    $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,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
+        $this->error = array("error" => "Failed to connect to server",
+                            "errno" => $errno,
+                            "errstr" => $errstr);
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     // 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")
-     socket_set_timeout($this->smtp_conn, $tval, 0);
+        socket_set_timeout($this->smtp_conn, $tval, 0);
 
     // get any announcement
     $announce = $this->get_lines();
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />';
     }
 
     return true;
-  }
-
-  /**
-   * Initiate a TLS 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() {
+    }
+
+    /**
+     * Initiate a TLS 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;
+        $this->error = array("error" => "Called StartTLS() without being connected");
+        return false;
     }
 
     fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
@@ -179,35 +179,35 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     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) {
+        $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 . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     // Begin encrypted connection
     if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-      return false;
+        return false;
     }
 
     return true;
-  }
-
-  /**
-   * Performs SMTP authentication.  Must be run after running the
-   * Hello() method.  Returns true if successfully authenticated.
-   * @access public
-   * @return bool
-   */
-  public function Authenticate($username, $password) {
+    }
+
+    /**
+     * Performs SMTP authentication.  Must be run after running the
+     * Hello() method.  Returns true if successfully authenticated.
+     * @access public
+     * @return bool
+     */
+    public function Authenticate($username, $password) {
     // Start authentication
     fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
 
@@ -215,14 +215,14 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($code != 334) {
-      $this->error =
+        $this->error =
         array("error" => "AUTH not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     // Send encoded username
@@ -232,14 +232,14 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($code != 334) {
-      $this->error =
+        $this->error =
         array("error" => "Username not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     // Send encoded password
@@ -249,87 +249,87 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($code != 235) {
-      $this->error =
+        $this->error =
         array("error" => "Password not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     return true;
-  }
-
-  /**
-   * Returns true if connected to a server otherwise false
-   * @access public
-   * @return bool
-   */
-  public function Connected() {
+    }
+
+    /**
+     * Returns true if connected to a server otherwise false
+     * @access public
+     * @return bool
+     */
+    public function Connected() {
     if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
+        $sock_status = socket_get_status($this->smtp_conn);
+        if($sock_status["eof"]) {
         // the socket is valid but we are not connected
         if($this->do_debug >= 1) {
             echo "SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected";
         }
         $this->Close();
         return false;
-      }
-      return true; // everything looks good
+        }
+        return true; // everything looks good
     }
     return false;
-  }
-
-  /**
-   * Closes the socket and cleans up the state of the class.
-   * It is not considered good to use this function without
-   * first trying to use QUIT.
-   * @access public
-   * @return void
-   */
-  public function Close() {
+    }
+
+    /**
+     * Closes the socket and cleans up the state of the class.
+     * It is not considered good to use this function without
+     * first trying to use QUIT.
+     * @access public
+     * @return void
+     */
+    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
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
-  }
-
-  /////////////////////////////////////////////////
-  // SMTP COMMANDS
-  /////////////////////////////////////////////////
-
-  /**
-   * Issues a data command and sends the msg_data to the server
-   * finializing the mail transaction. $msg_data is the message
-   * that is to be send with the headers. Each header needs to be
-   * on a single line followed by a <CRLF> with the message headers
-   * and the message body being seperated by and additional <CRLF>.
-   *
-   * Implements rfc 821: DATA <CRLF>
-   *
-   * SMTP CODE INTERMEDIATE: 354
-   *     [data]
-   *     <CRLF>.<CRLF>
-   *     SMTP CODE SUCCESS: 250
-   *     SMTP CODE FAILURE: 552,554,451,452
-   * SMTP CODE FAILURE: 451,554
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @return bool
-   */
-  public function Data($msg_data) {
+        // close the connection and cleanup
+        fclose($this->smtp_conn);
+        $this->smtp_conn = 0;
+    }
+    }
+
+    /////////////////////////////////////////////////
+    // SMTP COMMANDS
+    /////////////////////////////////////////////////
+
+    /**
+     * Issues a data command and sends the msg_data to the server
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being seperated by and additional <CRLF>.
+     *
+     * Implements rfc 821: DATA <CRLF>
+     *
+     * SMTP CODE INTERMEDIATE: 354
+     *     [data]
+     *     <CRLF>.<CRLF>
+     *     SMTP CODE SUCCESS: 250
+     *     SMTP CODE FAILURE: 552,554,451,452
+     * SMTP CODE FAILURE: 451,554
+     * SMTP CODE ERROR  : 500,501,503,421
+     * @access public
+     * @return bool
+     */
+    public function Data($msg_data) {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
+        $this->error = array(
+                "error" => "Called Data() without being connected");
+        return false;
     }
 
     fputs($this->smtp_conn,"DATA" . $this->CRLF);
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 354) {
-      $this->error =
+        $this->error =
         array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     /* the server is ready to accept data!
@@ -380,49 +380,49 @@  discard block
 block discarded – undo
     $field = substr($lines[0],0,strpos($lines[0],":"));
     $in_headers = false;
     if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
+        $in_headers = true;
     }
 
     $max_line_length = 998; // used below; set here for ease in change
 
     while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
+        $lines_out = null;
+        if($line == "" && $in_headers) {
         $in_headers = false;
-      }
-      // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
+        }
+        // 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
         if(!$pos) {
-          $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$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);
+            $lines_out[] = substr($line,0,$pos);
+            $line = substr($line,$pos + 1);
         }
 
         /* if processing headers add a LWSP-char to the front of new line
          * rfc 822 on long msg headers
          */
         if($in_headers) {
-          $line = "\t" . $line;
+            $line = "\t" . $line;
         }
-      }
-      $lines_out[] = $line;
+        }
+        $lines_out[] = $line;
 
-      // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
+        // send the lines to the server
+        while(list(,$line_out) = @each($lines_out)) {
         if(strlen($line_out) > 0)
         {
-          if(substr($line_out, 0, 1) == ".") {
+            if(substr($line_out, 0, 1) == ".") {
             $line_out = "." . $line_out;
-          }
+            }
         }
         fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
+        }
     }
 
     // message data has been sent
@@ -432,111 +432,111 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250) {
-      $this->error =
+        $this->error =
         array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
     return true;
-  }
-
-  /**
-   * Sends the HELO command to the smtp server.
-   * This makes sure that we and the server are in
-   * the same known state.
-   *
-   * Implements from rfc 821: HELO <SP> <domain> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500, 501, 504, 421
-   * @access public
-   * @return bool
-   */
-  public function Hello($host = '') {
+    }
+
+    /**
+     * Sends the HELO command to the smtp server.
+     * This makes sure that we and the server are in
+     * the same known state.
+     *
+     * Implements from rfc 821: HELO <SP> <domain> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE ERROR  : 500, 501, 504, 421
+     * @access public
+     * @return bool
+     */
+    public function Hello($host = '') {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
+        $this->error = array(
             "error" => "Called Hello() without being connected");
-      return false;
+        return false;
     }
 
     // if hostname for HELO was not specified send default
     if(empty($host)) {
-      // determine appropriate default to send to server
-      $host = "localhost";
+        // determine appropriate default to send to server
+        $host = "localhost";
     }
 
     // Send extended hello first (RFC 2821)
     if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
+        if(!$this->SendHello("HELO", $host)) {
         return false;
-      }
+        }
     }
 
     return true;
-  }
-
-  /**
-   * Sends a HELO/EHLO command.
-   * @access private
-   * @return bool
-   */
-  private function SendHello($hello, $host) {
+    }
+
+    /**
+     * Sends a HELO/EHLO command.
+     * @access private
+     * @return bool
+     */
+    private function SendHello($hello, $host) {
     fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
 
     $rply = $this->get_lines();
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250) {
-      $this->error =
+        $this->error =
         array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     $this->helo_rply = $rply;
 
     return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command.
-   *
-   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,421
-   * @access public
-   * @return bool
-   */
-  public function Mail($from) {
+    }
+
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command.
+     *
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,421
+     * @access public
+     * @return bool
+     */
+    public function Mail($from) {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
+        $this->error = array(
+                "error" => "Called Mail() without being connected");
+        return false;
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
@@ -546,40 +546,40 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250) {
-      $this->error =
+        $this->error =
         array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
     return true;
-  }
-
-  /**
-   * Sends the quit command to the server and then closes the socket
-   * if there is no error or the $close_on_error argument is true.
-   *
-   * Implements from rfc 821: QUIT <CRLF>
-   *
-   * SMTP CODE SUCCESS: 221
-   * SMTP CODE ERROR  : 500
-   * @access public
-   * @return bool
-   */
-  public function Quit($close_on_error = true) {
+    }
+
+    /**
+     * Sends the quit command to the server and then closes the socket
+     * if there is no error or the $close_on_error argument is true.
+     *
+     * Implements from rfc 821: QUIT <CRLF>
+     *
+     * SMTP CODE SUCCESS: 221
+     * SMTP CODE ERROR  : 500
+     * @access public
+     * @return bool
+     */
+    public function Quit($close_on_error = true) {
     $this->error = null; // so there is no confusion
 
     if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
+        $this->error = array(
+                "error" => "Called Quit() without being connected");
+        return false;
     }
 
     // send the quit command to the server
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
     $byemsg = $this->get_lines();
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';
     }
 
     $rval = true;
@@ -597,42 +597,42 @@  discard block
 block discarded – undo
 
     $code = substr($byemsg,0,3);
     if($code != 221) {
-      // 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));
-      $rval = false;
-      if($this->do_debug >= 1) {
+        // 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));
+        $rval = false;
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';
-      }
+        }
     }
 
     if(empty($e) || $close_on_error) {
-      $this->Close();
+        $this->Close();
     }
 
     return $rval;
-  }
-
-  /**
-   * Sends the command RCPT to the SMTP server with the TO: argument of $to.
-   * Returns true if the recipient was accepted false if it was rejected.
-   *
-   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250,251
-   * SMTP CODE FAILURE: 550,551,552,553,450,451,452
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @return bool
-   */
-  public function Recipient($to) {
+    }
+
+    /**
+     * Sends the command RCPT to the SMTP server with the TO: argument of $to.
+     * Returns true if the recipient was accepted false if it was rejected.
+     *
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250,251
+     * SMTP CODE FAILURE: 550,551,552,553,450,451,452
+     * SMTP CODE ERROR  : 500,501,503,421
+     * @access public
+     * @return bool
+     */
+    public function Recipient($to) {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
+        $this->error = array(
+                "error" => "Called Recipient() without being connected");
+        return false;
     }
 
     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
@@ -641,41 +641,41 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250 && $code != 251) {
-      $this->error =
+        $this->error =
         array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
     return true;
-  }
-
-  /**
-   * Sends the RSET command to abort and transaction that is
-   * currently in progress. Returns true if successful false
-   * otherwise.
-   *
-   * Implements rfc 821: RSET <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500,501,504,421
-   * @access public
-   * @return bool
-   */
-  public function Reset() {
+    }
+
+    /**
+     * Sends the RSET command to abort and transaction that is
+     * currently in progress. Returns true if successful false
+     * otherwise.
+     *
+     * Implements rfc 821: RSET <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE ERROR  : 500,501,504,421
+     * @access public
+     * @return bool
+     */
+    public function Reset() {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
+        $this->error = array(
+                "error" => "Called Reset() without being connected");
+        return false;
     }
 
     fputs($this->smtp_conn,"RSET" . $this->CRLF);
@@ -684,46 +684,46 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250) {
-      $this->error =
+        $this->error =
         array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
 
     return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command. This command
-   * will send the message to the users terminal if they are logged
-   * in and send them an email.
-   *
-   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,502,421
-   * @access public
-   * @return bool
-   */
-  public function SendAndMail($from) {
+    }
+
+    /**
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more Recipient
+     * commands may be called followed by a Data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     *
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE SUCCESS: 552,451,452
+     * SMTP CODE SUCCESS: 500,501,502,421
+     * @access public
+     * @return bool
+     */
+    public function SendAndMail($from) {
     $this->error = null; // so no confusion is caused
 
     if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
+        $this->error = array(
+            "error" => "Called SendAndMail() without being connected");
+        return false;
     }
 
     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
@@ -732,82 +732,82 @@  discard block
 block discarded – undo
     $code = substr($rply,0,3);
 
     if($this->do_debug >= 2) {
-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
+        echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';
     }
 
     if($code != 250) {
-      $this->error =
+        $this->error =
         array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
+                "smtp_code" => $code,
+                "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';
-      }
-      return false;
+        }
+        return false;
     }
     return true;
-  }
-
-  /**
-   * This is an optional command for SMTP that this class does not
-   * support. This method is here to make the RFC821 Definition
-   * complete for this class and __may__ be implimented in the future
-   *
-   * Implements from rfc 821: TURN <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE FAILURE: 502
-   * SMTP CODE ERROR  : 500, 503
-   * @access public
-   * @return bool
-   */
-  public function Turn() {
+    }
+
+    /**
+     * This is an optional command for SMTP that this class does not
+     * support. This method is here to make the RFC821 Definition
+     * complete for this class and __may__ be implimented in the future
+     *
+     * Implements from rfc 821: TURN <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250
+     * SMTP CODE FAILURE: 502
+     * SMTP CODE ERROR  : 500, 503
+     * @access public
+     * @return bool
+     */
+    public function Turn() {
     $this->error = array("error" => "This method, TURN, of the SMTP ".
                                     "is not implemented");
     if($this->do_debug >= 1) {
-      echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
+        echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />';
     }
     return false;
-  }
-
-  /**
-  * Get the current error
-  * @access public
-  * @return array
-  */
-  public function getError() {
+    }
+
+    /**
+     * Get the current error
+     * @access public
+     * @return array
+     */
+    public function getError() {
     return $this->error;
-  }
-
-  /////////////////////////////////////////////////
-  // INTERNAL FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Read in as many lines as possible
-   * either before eof or socket timeout occurs on the operation.
-   * With SMTP we can tell if we have more lines to read if the
-   * 4th character is '-' symbol. If it is a space then we don't
-   * need to read anything else.
-   * @access private
-   * @return string
-   */
-  private function get_lines() {
+    }
+
+    /////////////////////////////////////////////////
+    // INTERNAL FUNCTIONS
+    /////////////////////////////////////////////////
+
+    /**
+     * Read in as many lines as possible
+     * either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access private
+     * @return string
+     */
+    private function get_lines() {
     $data = "";
     while($str = @fgets($this->smtp_conn,515)) {
-      if($this->do_debug >= 4) {
+        if($this->do_debug >= 4) {
         echo "SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />';
         echo "SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />';
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
+        }
+        $data .= $str;
+        if($this->do_debug >= 4) {
         echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';
-      }
-      // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
+        }
+        // if 4th character is a space, we are done reading, break the loop
+        if(substr($str,3,1) == " ") { break; }
     }
     return $data;
-  }
+    }
 
 }
 

Please login to merge, or discard this patch.

main/inc/lib/phpmailer/class.pop3.php 1 patch

Indentation +203 added lines, -203 removed lines patch added patch discarded remove patch

@@ -60,103 +60,103 @@  discard block
 block discarded – undo
  */
 
 class POP3 {
-  /**
-   * Default POP3 port
-   * @var int
-   */
-  public $POP3_PORT = 110;
-
-  /**
-   * Default Timeout
-   * @var int
-   */
-  public $POP3_TIMEOUT = 30;
-
-  /**
-   * POP3 Carriage Return + Line Feed
-   * @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   * Displaying Debug warnings? (0 = now, 1+ = yes)
-   * @var int
-   */
-  public $do_debug = 2;
-
-  /**
-   * POP3 Mail Server
-   * @var string
-   */
-  public $host;
-
-  /**
-   * POP3 Port
-   * @var int
-   */
-  public $port;
-
-  /**
-   * POP3 Timeout Value
-   * @var int
-   */
-  public $tval;
-
-  /**
-   * POP3 Username
-   * @var string
-   */
-  public $username;
-
-  /**
-   * POP3 Password
-   * @var string
-   */
-  public $password;
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private $pop_conn;
-  private $connected;
-  private $error;     //  Error log array
-
-  /**
-   * Constructor, sets the initial values
-   * @access public
-   * @return POP3
-   */
-  public function __construct() {
+    /**
+     * Default POP3 port
+     * @var int
+     */
+    public $POP3_PORT = 110;
+
+    /**
+     * Default Timeout
+     * @var int
+     */
+    public $POP3_TIMEOUT = 30;
+
+    /**
+     * POP3 Carriage Return + Line Feed
+     * @var string
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Displaying Debug warnings? (0 = now, 1+ = yes)
+     * @var int
+     */
+    public $do_debug = 2;
+
+    /**
+     * POP3 Mail Server
+     * @var string
+     */
+    public $host;
+
+    /**
+     * POP3 Port
+     * @var int
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value
+     * @var int
+     */
+    public $tval;
+
+    /**
+     * POP3 Username
+     * @var string
+     */
+    public $username;
+
+    /**
+     * POP3 Password
+     * @var string
+     */
+    public $password;
+
+    /////////////////////////////////////////////////
+    // PROPERTIES, PRIVATE AND PROTECTED
+    /////////////////////////////////////////////////
+
+    private $pop_conn;
+    private $connected;
+    private $error;     //  Error log array
+
+    /**
+     * Constructor, sets the initial values
+     * @access public
+     * @return POP3
+     */
+    public function __construct() {
     $this->pop_conn  = 0;
     $this->connected = false;
     $this->error     = null;
-  }
-
-  /**
-   * Combination of public events - connect, login, disconnect
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @param string $username
-   * @param string $password
-   */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
+    }
+
+    /**
+     * Combination of public events - connect, login, disconnect
+     * @access public
+     * @param string $host
+     * @param integer $port
+     * @param integer $tval
+     * @param string $username
+     * @param string $password
+     */
+    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) {
-      $this->port = $this->POP3_PORT;
+        $this->port = $this->POP3_PORT;
     } else {
-      $this->port = $port;
+        $this->port = $port;
     }
 
     //  If no port value is passed, retrieve it
     if ($tval == false) {
-      $this->tval = $this->POP3_TIMEOUT;
+        $this->tval = $this->POP3_TIMEOUT;
     } else {
-      $this->tval = $tval;
+        $this->tval = $tval;
     }
 
     $this->do_debug = $debug_level;
@@ -170,13 +170,13 @@  discard block
 block discarded – undo
     $result = $this->Connect($this->host, $this->port, $this->tval);
 
     if ($result) {
-      $login_result = $this->Login($this->username, $this->password);
+        $login_result = $this->Login($this->username, $this->password);
 
-      if ($login_result) {
+        if ($login_result) {
         $this->Disconnect();
 
         return true;
-      }
+        }
 
     }
 
@@ -184,20 +184,20 @@  discard block
 block discarded – undo
     $this->Disconnect();
 
     return false;
-  }
-
-  /**
-   * Connect to the POP3 server
-   * @access public
-   * @param string $host
-   * @param integer $port
-   * @param integer $tval
-   * @return boolean
-   */
-  public function Connect ($host, $port = false, $tval = 30) {
+    }
+
+    /**
+     * Connect to the POP3 server
+     * @access public
+     * @param string $host
+     * @param integer $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function Connect ($host, $port = false, $tval = 30) {
     //  Are we already connected?
     if ($this->connected) {
-      return true;
+        return true;
     }
 
     /*
@@ -209,45 +209,45 @@  discard block
 block discarded – undo
 
     //  Connect to the POP3 server
     $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
+                    $port,    //  Port #
+                    $errno,   //  Error Number
+                    $errstr,  //  Error Message
+                    $tval);   //  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();
+        $this->displayErrors();
     }
 
     //  Did we connect?
     if ($this->pop_conn == false) {
-      //  It would appear not...
-      $this->error = array(
+        //  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) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
 
-      return false;
+        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);
+        stream_set_timeout($this->pop_conn, $tval, 0);
     } else {
-      //  Does not work on Windows
-      if (substr(PHP_OS, 0, 3) !== 'WIN') {
+        //  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
@@ -257,33 +257,33 @@  discard block
 block discarded – undo
     if ($this->checkResponse($pop3_response)) {
     //  The connection is established and the POP3 server is talking
     $this->connected = true;
-      return true;
+        return true;
     }
 
-  }
+    }
 
-  /**
-   * 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 = '') {
+    /**
+     * 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';
+        $this->error = 'Not connected to POP3 server';
 
-      if ($this->do_debug >= 1) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
     }
 
     if (empty($username)) {
-      $username = $this->username;
+        $username = $this->username;
     }
 
     if (empty($password)) {
-      $password = $this->password;
+        $password = $this->password;
     }
 
     $pop_username = "USER $username" . $this->CRLF;
@@ -294,114 +294,114 @@  discard block
 block discarded – undo
     $pop3_response = $this->getResponse();
 
     if ($this->checkResponse($pop3_response)) {
-      //  Send the Password
-      $this->sendString($pop_password);
-      $pop3_response = $this->getResponse();
+        //  Send the Password
+        $this->sendString($pop_password);
+        $pop3_response = $this->getResponse();
 
-      if ($this->checkResponse($pop3_response)) {
+        if ($this->checkResponse($pop3_response)) {
         return true;
-      } else {
+        } else {
         return false;
-      }
+        }
     } else {
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-   * Disconnect from the POP3 server
-   * @access public
-   */
-  public function Disconnect () {
+    /**
+     * Disconnect from the POP3 server
+     * @access public
+     */
+    public function Disconnect () {
     $this->sendString('QUIT');
 
     fclose($this->pop_conn);
-  }
-
-  /////////////////////////////////////////////////
-  //  Private Methods
-  /////////////////////////////////////////////////
-
-  /**
-   * 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) {
+    }
+
+    /////////////////////////////////////////////////
+    //  Private Methods
+    /////////////////////////////////////////////////
+
+    /**
+     * 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;
-  }
-
-  /**
-   * Send a string down the open socket connection to the POP3 server
-   * @access private
-   * @param string $string
-   * @return integer
-   */
-  private function sendString ($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;
-  }
-
-  /**
-   * Checks the POP3 server response for +OK or -ERR
-   * @access private
-   * @param string $string
-   * @return boolean
-   */
-  private function checkResponse ($string) {
+    }
+
+    /**
+     * 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(
+        $this->error = array(
         'error' => "Server reported an error: $string",
         'errno' => 0,
         'errstr' => ''
-      );
+        );
 
-      if ($this->do_debug >= 1) {
+        if ($this->do_debug >= 1) {
         $this->displayErrors();
-      }
+        }
 
-      return false;
+        return false;
     } else {
-      return true;
+        return true;
     }
 
-  }
+    }
 
-  /**
-   * If debug is enabled, display the error message array
-   * @access private
-   */
-  private function displayErrors () {
+    /**
+     * If debug is enabled, display the error message array
+     * @access private
+     */
+    private function displayErrors () {
     echo '<pre>';
 
     foreach ($this->error as $single_error) {
-      print_r($single_error);
+        print_r($single_error);
     }
 
     echo '</pre>';
-  }
-
-  /**
-   * Takes over from PHP for the socket warning handler
-   * @access private
-   * @param integer $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param integer $errline
-   */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
+    }
+
+    /**
+     * Takes over from PHP for the socket warning handler
+     * @access private
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     */
+    private function catchWarning ($errno, $errstr, $errfile, $errline) {
     $this->error[] = array(
-      'error' => "Connecting to the POP3 server raised a PHP warning: ",
-      'errno' => $errno,
-      'errstr' => $errstr
+        'error' => "Connecting to the POP3 server raised a PHP warning: ",
+        'errno' => $errno,
+        'errstr' => $errstr
     );
-  }
+    }
 
-  //  End of class
+    //  End of class
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

main/inc/lib/phpmailer/language/phpmailer.lang-ar.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@
 block discarded – undo
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.';
 //$PHPMAILER_LANG['provide_address']      = 'You must provide at least one recipient email address.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: الأخطاء التالية ' .
-                                          'فشل في الارسال لكل من : ';
+                                            'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';

Please login to merge, or discard this patch.

main/inc/lib/phpmailer/class.phpmailer.php 1 patch

Indentation +1454 added lines, -1454 removed lines patch added patch discarded remove patch

@@ -42,441 +42,441 @@  discard block
 block discarded – undo
 
 class PHPMailer {
 
-  /////////////////////////////////////////////////
-  // PROPERTIES, PUBLIC
-  /////////////////////////////////////////////////
-
-  /**
-   * Email priority (1 = High, 3 = Normal, 5 = low).
-   * @var int
-   */
-  public $Priority          = 3;
-
-  /**
-   * Sets the CharSet of the message.
-   * @var string
-   */
-  public $CharSet           = 'iso-8859-1';
-
-  /**
-   * Sets the Content-type of the message.
-   * @var string
-   */
-  public $ContentType       = 'text/plain';
-
-  /**
-   * Sets the Encoding of the message. Options for this are
-   *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
-   * @var string
-   */
-  public $Encoding          = '8bit';
-
-  /**
-   * Holds the most recent mailer error message.
-   * @var string
-   */
-  public $ErrorInfo         = '';
-
-  /**
-   * Sets the From email address for the message.
-   * @var string
-   */
-  public $From              = 'root@localhost';
-
-  /**
-   * Sets the From name of the message.
-   * @var string
-   */
-  public $FromName          = 'Root User';
-
-  /**
-   * Sets the Sender email (Return-Path) of the message.  If not empty,
-   * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-   * @var string
-   */
-  public $Sender            = '';
-
-  /**
-   * Sets the Subject of the message.
-   * @var string
-   */
-  public $Subject           = '';
-
-  /**
-   * Sets the Body of the message.  This can be either an HTML or text body.
-   * If HTML then run IsHTML(true).
-   * @var string
-   */
-  public $Body              = '';
-
-  /**
-   * Sets the text-only body of the message.  This automatically sets the
-   * email to multipart/alternative.  This body can be read by mail
-   * clients that do not have HTML email capability such as mutt. Clients
-   * that can read HTML will view the normal Body.
-   * @var string
-   */
-  public $AltBody           = '';
-
-  /**
-   * Sets word wrapping on the body of the message to a given number of
-   * characters.
-   * @var int
-   */
-  public $WordWrap          = 0;
-
-  /**
-   * Method to send mail: ("mail", "sendmail", or "smtp").
-   * @var string
-   */
-  public $Mailer            = 'mail';
-
-  /**
-   * Sets the path of the sendmail program.
-   * @var string
-   */
-  public $Sendmail          = '/usr/sbin/sendmail';
-
-  /**
-   * Path to PHPMailer plugins.  Useful if the SMTP class
-   * is in a different directory than the PHP include path.
-   * @var string
-   */
-  public $PluginDir         = '';
-
-  /**
-   * Sets the email address that a reading confirmation will be sent.
-   * @var string
-   */
-  public $ConfirmReadingTo  = '';
-
-  /**
-   * Sets the hostname to use in Message-Id and Received headers
-   * and as default HELO string. If empty, the value returned
-   * by SERVER_NAME is used or 'localhost.localdomain'.
-   * @var string
-   */
-  public $Hostname          = '';
-
-  /**
-   * Sets the message ID to be used in the Message-Id header.
-   * If empty, a unique id will be generated.
-   * @var string
-   */
-  public $MessageID         = '';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES FOR SMTP
-  /////////////////////////////////////////////////
-
-  /**
-   * Sets the SMTP hosts.  All hosts must be separated by a
-   * semicolon.  You can also specify a different port
-   * for each host by using this format: [hostname:port]
-   * (e.g. "smtp1.example.com:25;smtp2.example.com").
-   * Hosts will be tried in order.
-   * @var string
-   */
-  public $Host          = 'localhost';
-
-  /**
-   * Sets the default SMTP server port.
-   * @var int
-   */
-  public $Port          = 25;
-
-  /**
-   * Sets the SMTP HELO of the message (Default is $Hostname).
-   * @var string
-   */
-  public $Helo          = '';
-
-  /**
-   * Sets connection prefix.
-   * Options are "", "ssl" or "tls"
-   * @var string
-   */
-  public $SMTPSecure    = '';
-
-  /**
-   * Sets SMTP authentication. Utilizes the Username and Password variables.
-   * @var bool
-   */
-  public $SMTPAuth      = false;
-
-  /**
-   * Sets SMTP username.
-   * @var string
-   */
-  public $Username      = '';
-
-  /**
-   * Sets SMTP password.
-   * @var string
-   */
-  public $Password      = '';
-
-  /**
-   * Sets the SMTP server timeout in seconds.
-   * This function will not work with the win32 version.
-   * @var int
-   */
-  public $Timeout       = 10;
-
-  /**
-   * Sets SMTP class debugging on or off.
-   * @var bool
-   */
-  public $SMTPDebug     = false;
-
-  /**
-   * Prevents the SMTP connection from being closed after each mail
-   * sending.  If this is set to true then to close the connection
-   * requires an explicit call to SmtpClose().
-   * @var bool
-   */
-  public $SMTPKeepAlive = false;
-
-  /**
-   * Provides the ability to have the TO field process individual
-   * emails, instead of sending to entire TO addresses
-   * @var bool
-   */
-  public $SingleTo      = false;
-
-   /**
-   * If SingleTo is true, this provides the array to hold the email addresses
-   * @var bool
-   */
-  public $SingleToArray = array();
-
- /**
-   * Provides the ability to change the line ending
-   * @var string
-   */
-  public $LE              = "\n";
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * @var string
-   */
-  public $DKIM_selector   = 'phpmailer';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address '[email protected]'
-   * @var string
-   */
-  public $DKIM_identity   = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address '[email protected]'
-   * @var string
-   */
-  public $DKIM_domain     = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address '[email protected]'
-   * @var string
-   */
-  public $DKIM_private    = '';
-
-  /**
-   * Callback Action function name
-   * the function that handles the result of the send email action. Parameters:
-   *   bool    $result        result of the send action
-   *   string  $to            email address of the recipient
-   *   string  $cc            cc email addresses
-   *   string  $bcc           bcc email addresses
-   *   string  $subject       the subject
-   *   string  $body          the email body
-   * @var string
-   */
-  public $action_function = ''; //'callbackAction';
-
-  /**
-   * Sets the PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.1';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  private   $smtp           = NULL;
-  private   $to             = array();
-  private   $cc             = array();
-  private   $bcc            = array();
-  private   $ReplyTo        = array();
-  private   $all_recipients = array();
-  private   $attachment     = array();
-  private   $CustomHeader   = array();
-  private   $message_type   = '';
-  private   $boundary       = array();
-  protected $language       = array();
-  private   $error_count    = 0;
-  private   $sign_cert_file = "";
-  private   $sign_key_file  = "";
-  private   $sign_key_pass  = "";
-  private   $exceptions     = false;
-
-  /////////////////////////////////////////////////
-  // CONSTANTS
-  /////////////////////////////////////////////////
-
-  const STOP_MESSAGE  = 0; // message only, continue processing
-  const STOP_CONTINUE = 1; // message?, likely ok to continue processing
-  const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
-
-  /////////////////////////////////////////////////
-  // METHODS, VARIABLES
-  /////////////////////////////////////////////////
-
-  /**
-   * Constructor
-   * @param boolean $exceptions Should we throw external exceptions?
-   */
-  public function __construct($exceptions = false) {
+    /////////////////////////////////////////////////
+    // PROPERTIES, PUBLIC
+    /////////////////////////////////////////////////
+
+    /**
+     * Email priority (1 = High, 3 = Normal, 5 = low).
+     * @var int
+     */
+    public $Priority          = 3;
+
+    /**
+     * Sets the CharSet of the message.
+     * @var string
+     */
+    public $CharSet           = 'iso-8859-1';
+
+    /**
+     * Sets the Content-type of the message.
+     * @var string
+     */
+    public $ContentType       = 'text/plain';
+
+    /**
+     * Sets the Encoding of the message. Options for this are
+     *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @var string
+     */
+    public $Encoding          = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     * @var string
+     */
+    public $ErrorInfo         = '';
+
+    /**
+     * Sets the From email address for the message.
+     * @var string
+     */
+    public $From              = 'root@localhost';
+
+    /**
+     * Sets the From name of the message.
+     * @var string
+     */
+    public $FromName          = 'Root User';
+
+    /**
+     * Sets the Sender email (Return-Path) of the message.  If not empty,
+     * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @var string
+     */
+    public $Sender            = '';
+
+    /**
+     * Sets the Subject of the message.
+     * @var string
+     */
+    public $Subject           = '';
+
+    /**
+     * Sets the Body of the message.  This can be either an HTML or text body.
+     * If HTML then run IsHTML(true).
+     * @var string
+     */
+    public $Body              = '';
+
+    /**
+     * Sets the text-only body of the message.  This automatically sets the
+     * email to multipart/alternative.  This body can be read by mail
+     * clients that do not have HTML email capability such as mutt. Clients
+     * that can read HTML will view the normal Body.
+     * @var string
+     */
+    public $AltBody           = '';
+
+    /**
+     * Sets word wrapping on the body of the message to a given number of
+     * characters.
+     * @var int
+     */
+    public $WordWrap          = 0;
+
+    /**
+     * Method to send mail: ("mail", "sendmail", or "smtp").
+     * @var string
+     */
+    public $Mailer            = 'mail';
+
+    /**
+     * Sets the path of the sendmail program.
+     * @var string
+     */
+    public $Sendmail          = '/usr/sbin/sendmail';
+
+    /**
+     * Path to PHPMailer plugins.  Useful if the SMTP class
+     * is in a different directory than the PHP include path.
+     * @var string
+     */
+    public $PluginDir         = '';
+
+    /**
+     * Sets the email address that a reading confirmation will be sent.
+     * @var string
+     */
+    public $ConfirmReadingTo  = '';
+
+    /**
+     * Sets the hostname to use in Message-Id and Received headers
+     * and as default HELO string. If empty, the value returned
+     * by SERVER_NAME is used or 'localhost.localdomain'.
+     * @var string
+     */
+    public $Hostname          = '';
+
+    /**
+     * Sets the message ID to be used in the Message-Id header.
+     * If empty, a unique id will be generated.
+     * @var string
+     */
+    public $MessageID         = '';
+
+    /////////////////////////////////////////////////
+    // PROPERTIES FOR SMTP
+    /////////////////////////////////////////////////
+
+    /**
+     * Sets the SMTP hosts.  All hosts must be separated by a
+     * semicolon.  You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * Hosts will be tried in order.
+     * @var string
+     */
+    public $Host          = 'localhost';
+
+    /**
+     * Sets the default SMTP server port.
+     * @var int
+     */
+    public $Port          = 25;
+
+    /**
+     * Sets the SMTP HELO of the message (Default is $Hostname).
+     * @var string
+     */
+    public $Helo          = '';
+
+    /**
+     * Sets connection prefix.
+     * Options are "", "ssl" or "tls"
+     * @var string
+     */
+    public $SMTPSecure    = '';
+
+    /**
+     * Sets SMTP authentication. Utilizes the Username and Password variables.
+     * @var bool
+     */
+    public $SMTPAuth      = false;
+
+    /**
+     * Sets SMTP username.
+     * @var string
+     */
+    public $Username      = '';
+
+    /**
+     * Sets SMTP password.
+     * @var string
+     */
+    public $Password      = '';
+
+    /**
+     * Sets the SMTP server timeout in seconds.
+     * This function will not work with the win32 version.
+     * @var int
+     */
+    public $Timeout       = 10;
+
+    /**
+     * Sets SMTP class debugging on or off.
+     * @var bool
+     */
+    public $SMTPDebug     = false;
+
+    /**
+     * Prevents the SMTP connection from being closed after each mail
+     * sending.  If this is set to true then to close the connection
+     * requires an explicit call to SmtpClose().
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Provides the ability to have the TO field process individual
+     * emails, instead of sending to entire TO addresses
+     * @var bool
+     */
+    public $SingleTo      = false;
+
+    /**
+     * If SingleTo is true, this provides the array to hold the email addresses
+     * @var bool
+     */
+    public $SingleToArray = array();
+
+    /**
+     * Provides the ability to change the line ending
+     * @var string
+     */
+    public $LE              = "\n";
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * @var string
+     */
+    public $DKIM_selector   = 'phpmailer';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address '[email protected]'
+     * @var string
+     */
+    public $DKIM_identity   = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address '[email protected]'
+     * @var string
+     */
+    public $DKIM_domain     = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address '[email protected]'
+     * @var string
+     */
+    public $DKIM_private    = '';
+
+    /**
+     * Callback Action function name
+     * the function that handles the result of the send email action. Parameters:
+     *   bool    $result        result of the send action
+     *   string  $to            email address of the recipient
+     *   string  $cc            cc email addresses
+     *   string  $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     * @var string
+     */
+    public $action_function = ''; //'callbackAction';
+
+    /**
+     * Sets the PHPMailer Version number
+     * @var string
+     */
+    public $Version         = '5.1';
+
+    /////////////////////////////////////////////////
+    // PROPERTIES, PRIVATE AND PROTECTED
+    /////////////////////////////////////////////////
+
+    private   $smtp           = NULL;
+    private   $to             = array();
+    private   $cc             = array();
+    private   $bcc            = array();
+    private   $ReplyTo        = array();
+    private   $all_recipients = array();
+    private   $attachment     = array();
+    private   $CustomHeader   = array();
+    private   $message_type   = '';
+    private   $boundary       = array();
+    protected $language       = array();
+    private   $error_count    = 0;
+    private   $sign_cert_file = "";
+    private   $sign_key_file  = "";
+    private   $sign_key_pass  = "";
+    private   $exceptions     = false;
+
+    /////////////////////////////////////////////////
+    // CONSTANTS
+    /////////////////////////////////////////////////
+
+    const STOP_MESSAGE  = 0; // message only, continue processing
+    const STOP_CONTINUE = 1; // message?, likely ok to continue processing
+    const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
+
+    /////////////////////////////////////////////////
+    // METHODS, VARIABLES
+    /////////////////////////////////////////////////
+
+    /**
+     * Constructor
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = false) {
     $this->exceptions = ($exceptions == true);
-  }
-
-  /**
-   * Sets message type to HTML.
-   * @param bool $ishtml
-   * @return void
-   */
-  public function IsHTML($ishtml = true) {
+    }
+
+    /**
+     * Sets message type to HTML.
+     * @param bool $ishtml
+     * @return void
+     */
+    public function IsHTML($ishtml = true) {
     if ($ishtml) {
-      $this->ContentType = 'text/html';
+        $this->ContentType = 'text/html';
     } else {
-      $this->ContentType = 'text/plain';
+        $this->ContentType = 'text/plain';
+    }
     }
-  }
 
-  /**
-   * Sets Mailer to send message using SMTP.
-   * @return void
-   */
-  public function IsSMTP() {
+    /**
+     * Sets Mailer to send message using SMTP.
+     * @return void
+     */
+    public function IsSMTP() {
     $this->Mailer = 'smtp';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using PHP mail() function.
-   * @return void
-   */
-  public function IsMail() {
+    /**
+     * Sets Mailer to send message using PHP mail() function.
+     * @return void
+     */
+    public function IsMail() {
     $this->Mailer = 'mail';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using the $Sendmail program.
-   * @return void
-   */
-  public function IsSendmail() {
+    /**
+     * Sets Mailer to send message using the $Sendmail program.
+     * @return void
+     */
+    public function IsSendmail() {
     if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
+        $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
-  }
+    }
 
-  /**
-   * Sets Mailer to send message using the qmail MTA.
-   * @return void
-   */
-  public function IsQmail() {
+    /**
+     * Sets Mailer to send message using the qmail MTA.
+     * @return void
+     */
+    public function IsQmail() {
     if (stristr(ini_get('sendmail_path'), 'qmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
+        $this->Sendmail = '/var/qmail/bin/sendmail';
     }
     $this->Mailer = 'sendmail';
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, RECIPIENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds a "To" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddAddress($address, $name = '') {
+    }
+
+    /////////////////////////////////////////////////
+    // METHODS, RECIPIENTS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds a "To" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddAddress($address, $name = '') {
     return $this->AddAnAddress('to', $address, $name);
-  }
-
-  /**
-   * Adds a "Cc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddCC($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Cc" address.
+     * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddCC($address, $name = '') {
     return $this->AddAnAddress('cc', $address, $name);
-  }
-
-  /**
-   * Adds a "Bcc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddBCC($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Bcc" address.
+     * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function AddBCC($address, $name = '') {
     return $this->AddAnAddress('bcc', $address, $name);
-  }
-
-  /**
-   * Adds a "Reply-to" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean
-   */
-  public function AddReplyTo($address, $name = '') {
+    }
+
+    /**
+     * Adds a "Reply-to" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean
+     */
+    public function AddReplyTo($address, $name = '') {
     return $this->AddAnAddress('ReplyTo', $address, $name);
-  }
-
-  /**
-   * Adds an address to one of the recipient arrays
-   * Addresses that have been added already return false, but do not throw exceptions
-   * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-   * @param string $address The email address to send to
-   * @param string $name
-   * @return boolean true on success, false if address already used or invalid in some way
-   * @access private
-   */
-  private function AddAnAddress($kind, $address, $name = '') {
+    }
+
+    /**
+     * Adds an address to one of the recipient arrays
+     * Addresses that have been added already return false, but do not throw exceptions
+     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access private
+     */
+    private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      error_log('Invalid recipient array: ' . $kind);
-      return false;
+        error_log('Invalid recipient array: ' . $kind);
+        return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
+        $this->SetError($this->Lang('invalid_address').': '. $address);
+        if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      error_log($this->Lang('invalid_address').': '.$address);
-      return false;
+        }
+        error_log($this->Lang('invalid_address').': '.$address);
+        return false;
     }
     if ($kind != 'ReplyTo') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
+        if (!isset($this->all_recipients[strtolower($address)])) {
         array_push($this->$kind, array($address, $name));
         $this->all_recipients[strtolower($address)] = true;
         return true;
-      }
+        }
     } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+        if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
         $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
+        return true;
+    }
     }
-  }
-  return false;
+    return false;
 }
 
 /**
@@ -485,125 +485,125 @@  discard block
 block discarded – undo
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+    public function SetFrom($address, $name = '',$auto=1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
+        $this->SetError($this->Lang('invalid_address').': '. $address);
+        if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      error_log($this->Lang('invalid_address').': '.$address);
-      return false;
+        }
+        error_log($this->Lang('invalid_address').': '.$address);
+        return false;
     }
     $this->From = $address;
     $this->FromName = $name;
     if ($auto) {
-      if (empty($this->ReplyTo)) {
+        if (empty($this->ReplyTo)) {
         $this->AddAnAddress('ReplyTo', $address, $name);
-      }
-      if (empty($this->Sender)) {
+        }
+        if (empty($this->Sender)) {
         $this->Sender = $address;
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Check that a string looks roughly like an email address should
-   * Static so it can be used without instantiation
-   * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
-   * Conforms approximately to RFC2822
-   * @link http://www.hexillion.com/samples/#Regex Original pattern found here
-   * @param string $address The email address to check
-   * @return boolean
-   * @static
-   * @access public
-   */
-  public static function ValidateAddress($address) {
+    }
+
+    /**
+     * Check that a string looks roughly like an email address should
+     * Static so it can be used without instantiation
+     * Tries to use PHP built-in validator in the filter extension (from PHP 5.2), falls back to a reasonably competent regex validator
+     * Conforms approximately to RFC2822
+     * @link http://www.hexillion.com/samples/#Regex Original pattern found here
+     * @param string $address The email address to check
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+        if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
-      } else {
+        } else {
         return true;
-      }
+        }
     } else {
-      return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+        return preg_match('/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!\.)){0,61}[a-zA-Z0-9_-]?\.)+[a-zA-Z0-9_](?:[a-zA-Z0-9_\-](?!$)){0,61}[a-zA-Z0-9_]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/', $address);
+    }
     }
-  }
 
-  /////////////////////////////////////////////////
-  // METHODS, MAIL SENDING
-  /////////////////////////////////////////////////
+    /////////////////////////////////////////////////
+    // METHODS, MAIL SENDING
+    /////////////////////////////////////////////////
 
-  /**
-   * Creates message and assigns Mailer. If the message is
-   * not sent successfully then it returns false.  Use the ErrorInfo
-   * variable to view description of the error.
-   * @return bool
-   */
-  public function Send() {
+    /**
+     * Creates message and assigns Mailer. If the message is
+     * not sent successfully then it returns false.  Use the ErrorInfo
+     * variable to view description of the error.
+     * @return bool
+     */
+    public function Send() {
     try {
-      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+        if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
         throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-      }
+        }
 
-      // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+        // Set whether the message is multipart/alternative
+        if(!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
-      }
+        }
 
-      $this->error_count = 0; // reset errors
-      $this->SetMessageType();
-      $header = $this->CreateHeader();
-      $body = $this->CreateBody();
+        $this->error_count = 0; // reset errors
+        $this->SetMessageType();
+        $header = $this->CreateHeader();
+        $body = $this->CreateBody();
 
-      if (empty($this->Body)) {
+        if (empty($this->Body)) {
         throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
+        }
 
-      // digitally sign with DKIM if enabled
-      if ($this->DKIM_domain && $this->DKIM_private) {
+        // digitally sign with DKIM if enabled
+        if ($this->DKIM_domain && $this->DKIM_private) {
         $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
         $header = str_replace("\r\n","\n",$header_dkim) . $header;
-      }
+        }
 
-      // Choose the mailer and send through it
-      switch($this->Mailer) {
+        // Choose the mailer and send through it
+        switch($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($header, $body);
         case 'smtp':
           return $this->SmtpSend($header, $body);
         default:
           return $this->MailSend($header, $body);
-      }
+        }
 
     } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
+        $this->SetError($e->getMessage());
+        if ($this->exceptions) {
         throw $e;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Sends mail using the $Sendmail program.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function SendmailSend($header, $body) {
+        }
+        return false;
+    }
+    }
+
+    /**
+     * Sends mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @access protected
+     * @return bool
+     */
+    protected function SendmailSend($header, $body) {
     if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+        $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
     } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
+        $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
     }
     if ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $key => $val) {
+        foreach ($this->SingleToArray as $key => $val) {
         if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
         }
         fputs($mail, "To: " . $val . "\n");
         fputs($mail, $header);
@@ -613,164 +613,164 @@  discard block
 block discarded – undo
         $isSent = ($result == 0) ? 1 : 0;
         $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        }
         }
-      }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
+        if(!@$mail = popen($sendmail, 'w')) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-      if($result != 0) {
+        }
+        fputs($mail, $header);
+        fputs($mail, $body);
+        $result = pclose($mail);
+        // implement call back function if it exists
+        $isSent = ($result == 0) ? 1 : 0;
+        $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
+        if($result != 0) {
         throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Sends mail using the PHP mail() function.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @access protected
-   * @return bool
-   */
-  protected function MailSend($header, $body) {
+    }
+
+    /**
+     * Sends mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @access protected
+     * @return bool
+     */
+    protected function MailSend($header, $body) {
     $toArr = array();
     foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
+        $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-      if ($this->SingleTo === true && count($toArr) > 1) {
+        $old_from = ini_get('sendmail_from');
+        ini_set('sendmail_from', $this->Sender);
+        if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+            // implement call back function if it exists
+            $isSent = ($rt == 1) ? 1 : 0;
+            $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
-      } else {
+        } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
+        }
     } else {
-      if ($this->SingleTo === true && count($toArr) > 1) {
+        if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
-          // implement call back function if it exists
-          $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+            // implement call back function if it exists
+            $isSent = ($rt == 1) ? 1 : 0;
+            $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
         }
-      } else {
+        } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
-      }
+        }
     }
     if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
+        ini_set('sendmail_from', $old_from);
     }
     if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
-  }
-
-  /**
-   * Sends mail via SMTP using PhpSMTP
-   * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @uses SMTP
-   * @access protected
-   * @return bool
-   */
-  protected function SmtpSend($header, $body) {
+    }
+
+    /**
+     * Sends mail via SMTP using PhpSMTP
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @uses SMTP
+     * @access protected
+     * @return bool
+     */
+    protected function SmtpSend($header, $body) {
     require_once $this->PluginDir . 'class.smtp.php';
     $bad_rcpt = array();
 
     if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
     if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
     foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
+        if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
-      }
+        }
     }
     foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
+        if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
-      }
+        }
     }
     foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
+        if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
         $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      } else {
+        } else {
         // implement call back function if it exists
         $isSent = 1;
         $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
-      }
+        }
     }
 
 
     if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+        $badaddresses = implode(', ', $bad_rcpt);
+        throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
     }
     if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
     if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
+        $this->smtp->Reset();
     }
     return true;
-  }
-
-  /**
-   * Initiates a connection to an SMTP server.
-   * Returns false if the operation failed.
-   * @uses SMTP
-   * @access public
-   * @return bool
-   */
-  public function SmtpConnect() {
+    }
+
+    /**
+     * Initiates a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @uses SMTP
+     * @access public
+     * @return bool
+     */
+    public function SmtpConnect() {
     if(is_null($this->smtp)) {
-      $this->smtp = new SMTP();
+        $this->smtp = new SMTP();
     }
 
     $this->smtp->do_debug = $this->SMTPDebug;
@@ -780,14 +780,14 @@  discard block
 block discarded – undo
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+        while($index < count($hosts) && !$connection) {
         $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-          $host = $hostinfo[1];
-          $port = $hostinfo[2];
+            $host = $hostinfo[1];
+            $port = $hostinfo[2];
         } else {
-          $host = $hosts[$index];
-          $port = $this->Port;
+            $host = $hosts[$index];
+            $port = $this->Port;
         }
 
         $tls = ($this->SMTPSecure == 'tls');
@@ -795,140 +795,140 @@  discard block
 block discarded – undo
 
         if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
 
-          $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-          $this->smtp->Hello($hello);
+            $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
+            $this->smtp->Hello($hello);
 
-          if ($tls) {
+            if ($tls) {
             if (!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
+                throw new phpmailerException($this->Lang('tls'));
             }
 
             //We must resend HELO after tls negotiation
             $this->smtp->Hello($hello);
-          }
+            }
 
-          $connection = true;
-          if ($this->SMTPAuth) {
+            $connection = true;
+            if ($this->SMTPAuth) {
             if (!$this->smtp->Authenticate($this->Username, $this->Password)) {
-              throw new phpmailerException($this->Lang('authenticate'));
+                throw new phpmailerException($this->Lang('authenticate'));
+            }
             }
-          }
         }
         $index++;
         if (!$connection) {
-          throw new phpmailerException($this->Lang('connect_host'));
+            throw new phpmailerException($this->Lang('connect_host'));
+        }
         }
-      }
     } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      throw $e;
+        $this->smtp->Reset();
+        throw $e;
     }
     return true;
-  }
+    }
 
-  /**
-   * Closes the active SMTP session if one exists.
-   * @return void
-   */
-  public function SmtpClose() {
+    /**
+     * Closes the active SMTP session if one exists.
+     * @return void
+     */
+    public function SmtpClose() {
     if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+        if($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
-      }
-    }
-  }
-
-  /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
-  * @param string $lang_path Path to the language file directory
-  * @access public
-  */
-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
+        }
+    }
+    }
+
+    /**
+     * Sets the language for all class error messages.
+     * Returns false if it cannot load the language file.  The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
+     * @param string $lang_path Path to the language file directory
+     * @access public
+     */
+    function SetLanguage($langcode = 'en', $lang_path = 'language/') {
     //Define full set of translatable strings
     $PHPMAILER_LANG = array(
-      'provide_address' => 'You must provide at least one recipient email address.',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'execute' => 'Could not execute: ',
-      'instantiate' => 'Could not instantiate mail function.',
-      'authenticate' => 'SMTP Error: Could not authenticate.',
-      'from_failed' => 'The following From address failed: ',
-      'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-      'data_not_accepted' => 'SMTP Error: Data not accepted.',
-      'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-      'file_access' => 'Could not access file: ',
-      'file_open' => 'File Error: Could not open file: ',
-      'encoding' => 'Unknown encoding: ',
-      'signing' => 'Signing Error: ',
-      'smtp_error' => 'SMTP server error: ',
-      'empty_message' => 'Message body empty',
-      'invalid_address' => 'Invalid address',
-      'variable_set' => 'Cannot set or reset variable: '
+        'provide_address' => 'You must provide at least one recipient email address.',
+        'mailer_not_supported' => ' mailer is not supported.',
+        'execute' => 'Could not execute: ',
+        'instantiate' => 'Could not instantiate mail function.',
+        'authenticate' => 'SMTP Error: Could not authenticate.',
+        'from_failed' => 'The following From address failed: ',
+        'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+        'data_not_accepted' => 'SMTP Error: Data not accepted.',
+        'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+        'file_access' => 'Could not access file: ',
+        'file_open' => 'File Error: Could not open file: ',
+        'encoding' => 'Unknown encoding: ',
+        'signing' => 'Signing Error: ',
+        'smtp_error' => 'SMTP server error: ',
+        'empty_message' => 'Message body empty',
+        'invalid_address' => 'Invalid address',
+        'variable_set' => 'Cannot set or reset variable: '
     );
     //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
     $l = true;
     if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
+        $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
     }
     $this->language = $PHPMAILER_LANG;
     return ($l == true); //Returns false if language not found
-  }
+    }
 
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
-  public function GetTranslations() {
+    /**
+     * Return the current array of language strings
+     * @return array
+     */
+    public function GetTranslations() {
     return $this->language;
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MESSAGE CREATION
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates recipient headers.
-   * @access public
-   * @return string
-   */
-  public function AddrAppend($type, $addr) {
+    }
+
+    /////////////////////////////////////////////////
+    // METHODS, MESSAGE CREATION
+    /////////////////////////////////////////////////
+
+    /**
+     * Creates recipient headers.
+     * @access public
+     * @return string
+     */
+    public function AddrAppend($type, $addr) {
     $addr_str = $type . ': ';
     $addresses = array();
     foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
+        $addresses[] = $this->AddrFormat($a);
     }
     $addr_str .= implode(', ', $addresses);
     $addr_str .= $this->LE;
 
     return $addr_str;
-  }
-
-  /**
-   * Formats an address correctly.
-   * @access public
-   * @return string
-   */
-  public function AddrFormat($addr) {
+    }
+
+    /**
+     * Formats an address correctly.
+     * @access public
+     * @return string
+     */
+    public function AddrFormat($addr) {
     if (empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
+        return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
-  }
-
-  /**
-   * Wraps message for use with mailers that do not
-   * automatically perform wrapping and for quoted-printable.
-   * Original written by philippe.
-   * @param string $message The message to wrap
-   * @param integer $length The line length to wrap to
-   * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-   * @access public
-   * @return string
-   */
-  public function WrapText($message, $length, $qp_mode = false) {
+        return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+    }
+    }
+
+    /**
+     * Wraps message for use with mailers that do not
+     * automatically perform wrapping and for quoted-printable.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function WrapText($message, $length, $qp_mode = false) {
     $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
     // If utf-8 encoding is used, we will need to make sure we don't
     // split multibyte characters when we wrap
@@ -936,140 +936,140 @@  discard block
 block discarded – undo
 
     $message = $this->FixEOL($message);
     if (substr($message, -1) == $this->LE) {
-      $message = substr($message, 0, -1);
+        $message = substr($message, 0, -1);
     }
 
     $line = explode($this->LE, $message);
     $message = '';
     for ($i=0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+        $line_part = explode(' ', $line[$i]);
+        $buf = '';
+        for ($e = 0; $e<count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - 1;
-          if ($e != 0) {
+            $space_left = $length - strlen($buf) - 1;
+            if ($e != 0) {
             if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
+                $len = $space_left;
+                if ($is_utf8) {
                 $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
+                } elseif (substr($word, $len - 1, 1) == "=") {
                 $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
+                } elseif (substr($word, $len - 2, 1) == "=") {
                 $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+                }
+                $part = substr($word, 0, $len);
+                $word = substr($word, $len);
+                $buf .= ' ' . $part;
+                $message .= $buf . sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+                $message .= $buf . $soft_break;
             }
             $buf = '';
-          }
-          while (strlen($word) > 0) {
+            }
+            while (strlen($word) > 0) {
             $len = $length;
             if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
+                $len = $this->UTF8CharBoundary($word, $len);
             } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
+                $len--;
             } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
+                $len -= 2;
             }
             $part = substr($word, 0, $len);
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+                $message .= $part . sprintf("=%s", $this->LE);
             } else {
-              $buf = $part;
+                $buf = $part;
+            }
             }
-          }
         } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+            $buf_o = $buf;
+            $buf .= ($e == 0) ? $word : (' ' . $word);
 
-          if (strlen($buf) > $length and $buf_o != '') {
+            if (strlen($buf) > $length and $buf_o != '') {
             $message .= $buf_o . $soft_break;
             $buf = $word;
-          }
+            }
+        }
         }
-      }
-      $message .= $buf . $this->LE;
+        $message .= $buf . $this->LE;
     }
 
     return $message;
-  }
-
-  /**
-   * Finds last character boundary prior to maxLength in a utf-8
-   * quoted (printable) encoded string.
-   * Original written by Colin Brown.
-   * @access public
-   * @param string $encodedText utf-8 QP text
-   * @param int    $maxLength   find last character boundary prior to this length
-   * @return int
-   */
-  public function UTF8CharBoundary($encodedText, $maxLength) {
+    }
+
+    /**
+     * Finds last character boundary prior to maxLength in a utf-8
+     * quoted (printable) encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param int    $maxLength   find last character boundary prior to this length
+     * @return int
+     */
+    public function UTF8CharBoundary($encodedText, $maxLength) {
     $foundSplitPos = false;
     $lookBack = 3;
     while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
+        $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+        $encodedCharPos = strpos($lastChunk, "=");
+        if ($encodedCharPos !== false) {
         // Found start of encoded character byte within $lookBack block.
         // Check the encoded byte value (the 2 chars after the '=')
         $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
         $dec = hexdec($hex);
         if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
+            // If the encoded char was found at pos 0, it will fit
+            // otherwise reduce maxLength to start of the encoded char
+            $maxLength = ($encodedCharPos == 0) ? $maxLength :
           $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
+            $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
+            // Reduce maxLength to split at start of character
+            $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+            $foundSplitPos = true;
         } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
+            $lookBack += 3;
         }
-      } else {
+        } else {
         // No encoded character found
         $foundSplitPos = true;
-      }
+        }
     }
     return $maxLength;
-  }
+    }
 
 
-  /**
-   * Set the body wrapping.
-   * @access public
-   * @return void
-   */
-  public function SetWordWrap() {
+    /**
+     * Set the body wrapping.
+     * @access public
+     * @return void
+     */
+    public function SetWordWrap() {
     if($this->WordWrap < 1) {
-      return;
+        return;
     }
 
     switch($this->message_type) {
-      case 'alt':
+        case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
         break;
-      default:
+        default:
         $this->Body = $this->WrapText($this->Body, $this->WordWrap);
         break;
     }
-  }
+    }
 
-  /**
-   * Assembles message header.
-   * @access public
-   * @return string The assembled header
-   */
-  public function CreateHeader() {
+    /**
+     * Assembles message header.
+     * @access public
+     * @return string The assembled header
+     */
+    public function CreateHeader() {
     $result = '';
 
     // Set the boundaries
@@ -1079,24 +1079,24 @@  discard block
 block discarded – undo
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
     if($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
+        $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
+        $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
     if($this->Mailer != 'mail') {
-      if ($this->SingleTo === true) {
+        if ($this->SingleTo === true) {
         foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
+            $this->SingleToArray[] = $this->AddrFormat($t);
         }
-      } else {
+        } else {
         if(count($this->to) > 0) {
-          $result .= $this->AddrAppend('To', $this->to);
+            $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
-          $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+            $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+        }
         }
-      }
     }
 
     $from = array();
@@ -1106,97 +1106,97 @@  discard block
 block discarded – undo
 
     // sendmail and mail() extract Cc from the header before sending
     if(count($this->cc) > 0) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
+        $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
     if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
+        $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
     if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
+        $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
     if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
+        $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
     if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+        $result .= $this->HeaderLine('Message-ID',$this->MessageID);
     } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
+        $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
 
     if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+        $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
     }
 
     // Add custom headers
     for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
+        $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
+        $result .= $this->HeaderLine('MIME-Version', '1.0');
+        $result .= $this->GetMailMIME();
     }
 
     return $result;
-  }
-
-  /**
-   * Returns the message MIME.
-   * @access public
-   * @return string
-   */
-  public function GetMailMIME() {
+    }
+
+    /**
+     * Returns the message MIME.
+     * @access public
+     * @return string
+     */
+    public function GetMailMIME() {
     $result = '';
     switch($this->message_type) {
-      case 'plain':
+        case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
-      case 'attachments':
+        case 'attachments':
       case 'alt_attachments':
         if($this->InlineImageExists()){
-          $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
+            $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
-          $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+            $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
+            $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         }
         break;
-      case 'alt':
+        case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
         $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
         break;
     }
 
     if($this->Mailer != 'mail') {
-      $result .= $this->LE.$this->LE;
+        $result .= $this->LE.$this->LE;
     }
 
     return $result;
-  }
-
-  /**
-   * Assembles the message body.  Returns an empty string on failure.
-   * @access public
-   * @return string The assembled message body
-   */
-  public function CreateBody() {
+    }
+
+    /**
+     * Assembles the message body.  Returns an empty string on failure.
+     * @access public
+     * @return string The assembled message body
+     */
+    public function CreateBody() {
     $body = '';
 
     if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME();
+        $body .= $this->GetMailMIME();
     }
 
     $this->SetWordWrap();
 
     switch($this->message_type) {
-      case 'alt':
+        case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
@@ -1205,16 +1205,16 @@  discard block
 block discarded – undo
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[1]);
         break;
-      case 'plain':
+        case 'plain':
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         break;
-      case 'attachments':
+        case 'attachments':
         $body .= $this->GetBoundary($this->boundary[1], '', '', '');
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE;
         $body .= $this->AttachAll();
         break;
-      case 'alt_attachments':
+        case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
         $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
         $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
@@ -1229,46 +1229,46 @@  discard block
 block discarded – undo
     }
 
     if ($this->IsError()) {
-      $body = '';
+        $body = '';
     } elseif ($this->sign_key_file) {
-      try {
+        try {
         $file = tempnam('', 'mail');
         file_put_contents($file, $body); //TODO check this worked
         $signed = tempnam("", "signed");
         if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
-          @unlink($file);
-          @unlink($signed);
-          $body = file_get_contents($signed);
+            @unlink($file);
+            @unlink($signed);
+            $body = file_get_contents($signed);
         } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
+            @unlink($file);
+            @unlink($signed);
+            throw new phpmailerException($this->Lang("signing").openssl_error_string());
         }
-      } catch (phpmailerException $e) {
+        } catch (phpmailerException $e) {
         $body = '';
         if ($this->exceptions) {
-          throw $e;
+            throw $e;
+        }
         }
-      }
     }
 
     return $body;
-  }
+    }
 
-  /**
-   * Returns the start of a message boundary.
-   * @access private
-   */
-  private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
+    /**
+     * Returns the start of a message boundary.
+     * @access private
+     */
+    private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
     if($charSet == '') {
-      $charSet = $this->CharSet;
+        $charSet = $this->CharSet;
     }
     if($contentType == '') {
-      $contentType = $this->ContentType;
+        $contentType = $this->ContentType;
     }
     if($encoding == '') {
-      $encoding = $this->Encoding;
+        $encoding = $this->Encoding;
     }
     $result .= $this->TextLine('--' . $boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
@@ -1277,80 +1277,80 @@  discard block
 block discarded – undo
     $result .= $this->LE;
 
     return $result;
-  }
+    }
 
-  /**
-   * Returns the end of a message boundary.
-   * @access private
-   */
-  private function EndBoundary($boundary) {
+    /**
+     * Returns the end of a message boundary.
+     * @access private
+     */
+    private function EndBoundary($boundary) {
     return $this->LE . '--' . $boundary . '--' . $this->LE;
-  }
-
-  /**
-   * Sets the message type.
-   * @access private
-   * @return void
-   */
-  private function SetMessageType() {
+    }
+
+    /**
+     * Sets the message type.
+     * @access private
+     * @return void
+     */
+    private function SetMessageType() {
     if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
-      $this->message_type = 'plain';
+        $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+        if(count($this->attachment) > 0) {
         $this->message_type = 'attachments';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+        }
+        if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
-      }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+        }
+        if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
-      }
+        }
+    }
     }
-  }
 
-  /**
-   *  Returns a formatted header line.
-   * @access public
-   * @return string
-   */
-  public function HeaderLine($name, $value) {
+    /**
+     *  Returns a formatted header line.
+     * @access public
+     * @return string
+     */
+    public function HeaderLine($name, $value) {
     return $name . ': ' . $value . $this->LE;
-  }
-
-  /**
-   * Returns a formatted mail line.
-   * @access public
-   * @return string
-   */
-  public function TextLine($value) {
+    }
+
+    /**
+     * Returns a formatted mail line.
+     * @access public
+     * @return string
+     */
+    public function TextLine($value) {
     return $value . $this->LE;
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, ATTACHMENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds an attachment from a path on the filesystem.
-   * Returns false if the file could not be found
-   * or accessed.
-   * @param string $path Path to the attachment.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /////////////////////////////////////////////////
+    // CLASS METHODS, ATTACHMENTS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds an attachment from a path on the filesystem.
+     * Returns false if the file could not be found
+     * or accessed.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return bool
+     */
+    public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-      if ( !@is_file($path) ) {
+        if ( !@is_file($path) ) {
         throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-      }
-      $filename = basename($path);
-      if ( $name == '' ) {
+        }
+        $filename = basename($path);
+        if ( $name == '' ) {
         $name = $filename;
-      }
+        }
 
-      $this->attachment[] = array(
+        $this->attachment[] = array(
         0 => $path,
         1 => $filename,
         2 => $name,
@@ -1359,36 +1359,36 @@  discard block
 block discarded – undo
         5 => false,  // isStringAttachment
         6 => 'attachment',
         7 => 0
-      );
+        );
 
     } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
+        $this->SetError($e->getMessage());
+        if ($this->exceptions) {
         throw $e;
-      }
-      error_log($e->getMessage()."\n");
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+        }
+        error_log($e->getMessage()."\n");
+        if ( $e->getCode() == self::STOP_CRITICAL ) {
         return false;
-      }
+        }
     }
     return true;
-  }
+    }
 
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
-  public function GetAttachments() {
+    /**
+     * Return the current array of attachments
+     * @return array
+     */
+    public function GetAttachments() {
     return $this->attachment;
-  }
-
-  /**
-   * Attaches all fs, string, and binary attachments to the message.
-   * Returns an empty string on failure.
-   * @access private
-   * @return string
-   */
-  private function AttachAll() {
+    }
+
+    /**
+     * Attaches all fs, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access private
+     * @return string
+     */
+    private function AttachAll() {
     // Return text of body
     $mime = array();
     $cidUniq = array();
@@ -1396,70 +1396,70 @@  discard block
 block discarded – undo
 
     // Add all attachments
     foreach ($this->attachment as $attachment) {
-      // Check for string attachment
-      $bString = $attachment[5];
-      if ($bString) {
+        // Check for string attachment
+        $bString = $attachment[5];
+        if ($bString) {
         $string = $attachment[0];
-      } else {
+        } else {
         $path = $attachment[0];
-      }
-
-      if (in_array($attachment[0], $incl)) { continue; }
-      $filename    = $attachment[1];
-      $name        = $attachment[2];
-      $encoding    = $attachment[3];
-      $type        = $attachment[4];
-      $disposition = $attachment[6];
-      $cid         = $attachment[7];
-      $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-      $cidUniq[$cid] = true;
-
-      $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
-      $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-      $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-      if($disposition == 'inline') {
+        }
+
+        if (in_array($attachment[0], $incl)) { continue; }
+        $filename    = $attachment[1];
+        $name        = $attachment[2];
+        $encoding    = $attachment[3];
+        $type        = $attachment[4];
+        $disposition = $attachment[6];
+        $cid         = $attachment[7];
+        $incl[]      = $attachment[0];
+        if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+        $cidUniq[$cid] = true;
+
+        $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
+        $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
+        $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
+
+        if($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
-      }
+        }
 
-      $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
+        $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
-      // Encode as string attachment
-      if($bString) {
+        // Encode as string attachment
+        if($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
         if($this->IsError()) {
-          return '';
+            return '';
         }
         $mime[] = $this->LE.$this->LE;
-      } else {
+        } else {
         $mime[] = $this->EncodeFile($path, $encoding);
         if($this->IsError()) {
-          return '';
+            return '';
         }
         $mime[] = $this->LE.$this->LE;
-      }
+        }
     }
 
     $mime[] = sprintf("--%s--%s", $this->boundary[1], $this->LE);
 
     return join('', $mime);
-  }
-
-  /**
-   * Encodes attachment in requested format.
-   * Returns an empty string on failure.
-   * @param string $path The full path to the file
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @see EncodeFile()
-   * @access private
-   * @return string
-   */
-  private function EncodeFile($path, $encoding = 'base64') {
+    }
+
+    /**
+     * Encodes attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @see EncodeFile()
+     * @access private
+     * @return string
+     */
+    private function EncodeFile($path, $encoding = 'base64') {
     try {
-      if (!is_readable($path)) {
+        if (!is_readable($path)) {
         throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-      }
+        }
         $magic_quotes = get_magic_quotes_runtime();
         if ($magic_quotes) {
             if (version_compare(PHP_VERSION, '5.3.0', '<')) {
@@ -1479,114 +1479,114 @@  discard block
 block discarded – undo
         }
         return $file_buffer;
     } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
-  }
-
-  /**
-   * Encodes string to requested format.
-   * Returns an empty string on failure.
-   * @param string $str The text to encode
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @access public
-   * @return string
-   */
-  public function EncodeString ($str, $encoding = 'base64') {
+        $this->SetError($e->getMessage());
+        return '';
+    }
+    }
+
+    /**
+     * Encodes string to requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function EncodeString ($str, $encoding = 'base64') {
     $encoded = '';
     switch(strtolower($encoding)) {
-      case 'base64':
+        case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
-      case '7bit':
+        case '7bit':
       case '8bit':
         $encoded = $this->FixEOL($str);
         //Make sure it ends with a line break
         if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
+            $encoded .= $this->LE;
         break;
-      case 'binary':
+        case 'binary':
         $encoded = $str;
         break;
-      case 'quoted-printable':
+        case 'quoted-printable':
         $encoded = $this->EncodeQP($str);
         break;
-      default:
+        default:
         $this->SetError($this->Lang('encoding') . $encoding);
         break;
     }
     return $encoded;
-  }
-
-  /**
-   * Encode a header string to best (shortest) of Q, B, quoted or none.
-   * @access public
-   * @return string
-   */
-  public function EncodeHeader($str, $position = 'text') {
+    }
+
+    /**
+     * Encode a header string to best (shortest) of Q, B, quoted or none.
+     * @access public
+     * @return string
+     */
+    public function EncodeHeader($str, $position = 'text') {
     $x = 0;
 
     switch (strtolower($position)) {
-      case 'phrase':
+        case 'phrase':
         if (!preg_match('/[\200-\377]/', $str)) {
-          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+            // Can't use addslashes as we don't know what value has magic_quotes_sybase
+            $encoded = addcslashes($str, "\0..\37\177\\\"");
+            if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
             return ($encoded);
-          } else {
+            } else {
             return ("\"$encoded\"");
-          }
+            }
         }
         $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
         break;
-      case 'comment':
+        case 'comment':
         $x = preg_match_all('/[()"]/', $str, $matches);
         // Fall-through
-      case 'text':
+        case 'text':
       default:
         $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
         break;
     }
 
     if ($x == 0) {
-      return ($str);
+        return ($str);
     }
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
     if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      // Modified by Ivan Tcholakov, 24-JAN-2010.
-      //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-      if ($this->HasMultiBytes($str)) {
-      //
+        $encoding = 'B';
+        // Modified by Ivan Tcholakov, 24-JAN-2010.
+        //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
+        if ($this->HasMultiBytes($str)) {
+        //
         // Use a custom function which correctly encodes and wraps long
         // multibyte strings without breaking lines within a character
         $encoded = $this->Base64EncodeWrapMB($str);
-      } else {
+        } else {
         $encoded = base64_encode($str);
         $maxlen -= $maxlen % 4;
         $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
+        }
     } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
+        $encoding = 'Q';
+        $encoded = $this->EncodeQ($str, $position);
+        $encoded = $this->WrapText($encoded, $maxlen, true);
+        $encoded = str_replace('='.$this->LE, "\n", trim($encoded));
     }
 
     $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
     $encoded = trim(str_replace("\n", $this->LE, $encoded));
 
     return $encoded;
-  }
-
-  /**
-   * Checks if a string contains multibyte characters.
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return bool
-   */
+    }
+
+    /**
+     * Checks if a string contains multibyte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return bool
+     */
     public function HasMultiBytes($str)
     {
         if (function_exists('mb_strlen')) {
@@ -1597,15 +1597,15 @@  discard block
 block discarded – undo
 
     }
 
-  /**
-   * Correctly encodes and wraps long multibyte strings for mail headers
-   * without breaking lines within a character.
-   * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return string
-   */
-  public function Base64EncodeWrapMB($str) {
+    /**
+     * Correctly encodes and wraps long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return string
+     */
+    public function Base64EncodeWrapMB($str) {
     $start = "=?".$this->CharSet."?B?";
     $end = "?=";
     $encoded = "";
@@ -1622,9 +1622,9 @@  discard block
 block discarded – undo
     $offset = $avgLength = floor($length * $ratio * .75);
 
     for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
+        $lookBack = 0;
 
-      do {
+        do {
         $offset = $avgLength - $lookBack;
         // Modified by Ivan Tcholakov, 24-JAN-2010.
         //$chunk = mb_substr($str, $i, $offset, $this->CharSet);
@@ -1632,85 +1632,85 @@  discard block
 block discarded – undo
         //
         $chunk = base64_encode($chunk);
         $lookBack++;
-      }
-      while (strlen($chunk) > $length);
+        }
+        while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+        $encoded .= $chunk . $this->LE;
     }
 
     // Chomp the last linefeed
     $encoded = substr($encoded, 0, -strlen($this->LE));
     return $encoded;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @return string
-  */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
+    }
+
+    /**
+     * Encode string to quoted-printable.
+     * Only uses standard PHP, slow, but will always work
+     * @access public
+     * @param string $string the text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     */
+    public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
     $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
     while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
+        $linlen = strlen($line);
+        $newline = '';
+        for($i = 0; $i < $linlen; $i++) {
         $c = substr( $line, $i, 1 );
         $dec = ord( $c );
         if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
+            $c = '=2E';
         }
         if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+            if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+            } else if ( $space_conv ) {
             $c = '=20';
-          }
+            }
         } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
+            $h2 = floor($dec/16);
+            $h1 = floor($dec%16);
+            $c = $escape.$hex[$h2].$hex[$h1];
         }
         if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+            $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
+            $newline = '';
+            // check if newline first character will be point or not
+            if ( $dec == 46 ) {
             $c = '=2E';
-          }
+            }
         }
         $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
+        } // end of for
+        $output .= $newline.$eol;
     } // end of while
     return $output;
-  }
-
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
-  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
+    }
+
+    /**
+     * Encode string to RFC2045 (6.7) quoted-printable format
+     * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
+     * Also results in same content as you started with after decoding
+     * @see EncodeQPphp()
+     * @access public
+     * @param string $string the text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
+     * @return string
+     * @author Marcus Bointon
+     */
+    public function EncodeQP($string, $line_max = 76, $space_conv = false) {
     if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
+        return quoted_printable_encode($string);
     }
     $filters = stream_get_filters();
     if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
+        return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
     }
     $fp = fopen('php://temp/', 'r+');
     $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
@@ -1723,32 +1723,32 @@  discard block
 block discarded – undo
     $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
     fclose($fp);
     return $out;
-  }
-
-  /**
-   * Encode string to q encoding.
-   * @link http://tools.ietf.org/html/rfc2047
-   * @param string $str the text to encode
-   * @param string $position Where the text is going to be used, see the RFC for what that means
-   * @access public
-   * @return string
-   */
-  public function EncodeQ ($str, $position = 'text') {
+    }
+
+    /**
+     * Encode string to q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function EncodeQ ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
     switch (strtolower($position)) {
-      case 'phrase':
+        case 'phrase':
         $encoded = preg_replace("/([^A-Za-z0-9!*+\/ -])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
-      case 'comment':
+        case 'comment':
         $encoded = preg_replace("/([\(\)\"])/e", "'='.sprintf('%02X', ord('\\1'))", $encoded);
-      case 'text':
+        case 'text':
       default:
         // Replace every high ascii, control =, ? and _ characters
         //TODO using /e (equivalent to eval()) is probably not a good idea
         $encoded = preg_replace('/([\000-\011\013\014\016-\037\075\077\137\177-\377])/e',
-              "'='.sprintf('%02X', ord('\\1'))", $encoded);
+                "'='.sprintf('%02X', ord('\\1'))", $encoded);
         break;
     }
 
@@ -1756,187 +1756,187 @@  discard block
 block discarded – undo
     $encoded = str_replace(' ', '_', $encoded);
 
     return $encoded;
-  }
-
-  /**
-   * Adds a string or binary attachment (non-filesystem) to the list.
-   * This method can be used to attach ascii or binary data,
-   * such as a BLOB record from a database.
-   * @param string $string String attachment data.
-   * @param string $filename Name of the attachment.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return void
-   */
-  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /**
+     * Adds a string or binary attachment (non-filesystem) to the list.
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return void
+     */
+    public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
     // Append to $attachment array
     $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
+        0 => $string,
+        1 => $filename,
+        2 => basename($filename),
+        3 => $encoding,
+        4 => $type,
+        5 => true,  // isStringAttachment
+        6 => 'attachment',
+        7 => 0
     );
-  }
-
-  /**
-   * Adds an embedded attachment.  This can include images, sounds, and
-   * just about any other document.  Make sure to set the $type to an
-   * image type.  For JPEG images use "image/jpeg" and for GIF images
-   * use "image/gif".
-   * @param string $path Path to the attachment.
-   * @param string $cid Content ID of the attachment.  Use this to identify
-   *        the Id for accessing the image in an HTML form.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
+    }
+
+    /**
+     * Adds an embedded attachment.  This can include images, sounds, and
+     * just about any other document.  Make sure to set the $type to an
+     * image type.  For JPEG images use "image/jpeg" and for GIF images
+     * use "image/gif".
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment.  Use this to identify
+     *        the Id for accessing the image in an HTML form.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @return bool
+     */
+    public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
     if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
+        $this->SetError($this->Lang('file_access') . $path);
+        return false;
     }
 
     $filename = basename($path);
     if ( $name == '' ) {
-      $name = $filename;
+        $name = $filename;
     }
 
     // Append to $attachment array
     $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
+        0 => $path,
+        1 => $filename,
+        2 => $name,
+        3 => $encoding,
+        4 => $type,
+        5 => false,  // isStringAttachment
+        6 => 'inline',
+        7 => $cid
     );
 
     return true;
-  }
-
-  /**
-   * Returns true if an inline attachment is present.
-   * @access public
-   * @return bool
-   */
-  public function InlineImageExists() {
+    }
+
+    /**
+     * Returns true if an inline attachment is present.
+     * @access public
+     * @return bool
+     */
+    public function InlineImageExists() {
     foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
+        if ($attachment[6] == 'inline') {
         return true;
-      }
+        }
     }
     return false;
-  }
+    }
 
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MESSAGE RESET
-  /////////////////////////////////////////////////
+    /////////////////////////////////////////////////
+    // CLASS METHODS, MESSAGE RESET
+    /////////////////////////////////////////////////
 
-  /**
-   * Clears all recipients assigned in the TO array.  Returns void.
-   * @return void
-   */
-  public function ClearAddresses() {
+    /**
+     * Clears all recipients assigned in the TO array.  Returns void.
+     * @return void
+     */
+    public function ClearAddresses() {
     foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
+        unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the CC array.  Returns void.
-   * @return void
-   */
-  public function ClearCCs() {
+    /**
+     * Clears all recipients assigned in the CC array.  Returns void.
+     * @return void
+     */
+    public function ClearCCs() {
     foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
+        unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the BCC array.  Returns void.
-   * @return void
-   */
-  public function ClearBCCs() {
+    /**
+     * Clears all recipients assigned in the BCC array.  Returns void.
+     * @return void
+     */
+    public function ClearBCCs() {
     foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
+        unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
-  }
+    }
 
-  /**
-   * Clears all recipients assigned in the ReplyTo array.  Returns void.
-   * @return void
-   */
-  public function ClearReplyTos() {
+    /**
+     * Clears all recipients assigned in the ReplyTo array.  Returns void.
+     * @return void
+     */
+    public function ClearReplyTos() {
     $this->ReplyTo = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the TO, CC and BCC
-   * array.  Returns void.
-   * @return void
-   */
-  public function ClearAllRecipients() {
+    }
+
+    /**
+     * Clears all recipients assigned in the TO, CC and BCC
+     * array.  Returns void.
+     * @return void
+     */
+    public function ClearAllRecipients() {
     $this->to = array();
     $this->cc = array();
     $this->bcc = array();
     $this->all_recipients = array();
-  }
-
-  /**
-   * Clears all previously set filesystem, string, and binary
-   * attachments.  Returns void.
-   * @return void
-   */
-  public function ClearAttachments() {
+    }
+
+    /**
+     * Clears all previously set filesystem, string, and binary
+     * attachments.  Returns void.
+     * @return void
+     */
+    public function ClearAttachments() {
     $this->attachment = array();
-  }
+    }
 
-  /**
-   * Clears all custom headers.  Returns void.
-   * @return void
-   */
-  public function ClearCustomHeaders() {
+    /**
+     * Clears all custom headers.  Returns void.
+     * @return void
+     */
+    public function ClearCustomHeaders() {
     $this->CustomHeader = array();
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MISCELLANEOUS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds the error message to the error container.
-   * @access protected
-   * @return void
-   */
-  protected function SetError($msg) {
+    }
+
+    /////////////////////////////////////////////////
+    // CLASS METHODS, MISCELLANEOUS
+    /////////////////////////////////////////////////
+
+    /**
+     * Adds the error message to the error container.
+     * @access protected
+     * @return void
+     */
+    protected function SetError($msg) {
     $this->error_count++;
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+        $lasterror = $this->smtp->getError();
+        if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
         $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
+        }
     }
     $this->ErrorInfo = $msg;
-  }
-
-  /**
-   * Returns the proper RFC 822 formatted date.
-   * @access public
-   * @return string
-   * @static
-   */
-  public static function RFCDate() {
+    }
+
+    /**
+     * Returns the proper RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function RFCDate() {
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
@@ -1944,346 +1944,346 @@  discard block
 block discarded – undo
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
-  }
-
-  /**
-   * Returns the server hostname or 'localhost.localdomain' if unknown.
-   * @access private
-   * @return string
-   */
-  private function ServerHostname() {
+    }
+
+    /**
+     * Returns the server hostname or 'localhost.localdomain' if unknown.
+     * @access private
+     * @return string
+     */
+    private function ServerHostname() {
     if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
+        $result = $this->Hostname;
     } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
+        $result = $_SERVER['SERVER_NAME'];
     } else {
-      $result = 'localhost.localdomain';
+        $result = 'localhost.localdomain';
     }
 
     return $result;
-  }
-
-  /**
-   * Returns a message in the appropriate language.
-   * @access private
-   * @return string
-   */
-  private function Lang($key) {
+    }
+
+    /**
+     * Returns a message in the appropriate language.
+     * @access private
+     * @return string
+     */
+    private function Lang($key) {
     if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
+        $this->SetLanguage('en'); // set the default language
     }
 
     if(isset($this->language[$key])) {
-      return $this->language[$key];
+        return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+        return 'Language string failed to load: ' . $key;
+    }
     }
-  }
 
-  /**
-   * Returns true if an error occurred.
-   * @access public
-   * @return bool
-   */
-  public function IsError() {
+    /**
+     * Returns true if an error occurred.
+     * @access public
+     * @return bool
+     */
+    public function IsError() {
     return ($this->error_count > 0);
-  }
-
-  /**
-   * Changes every end of line from CR or LF to CRLF.
-   * @access private
-   * @return string
-   */
-  private function FixEOL($str) {
+    }
+
+    /**
+     * Changes every end of line from CR or LF to CRLF.
+     * @access private
+     * @return string
+     */
+    private function FixEOL($str) {
     $str = str_replace("\r\n", "\n", $str);
     $str = str_replace("\r", "\n", $str);
     $str = str_replace("\n", $this->LE, $str);
     return $str;
-  }
-
-  /**
-   * Adds a custom header.
-   * @access public
-   * @return void
-   */
-  public function AddCustomHeader($custom_header) {
+    }
+
+    /**
+     * Adds a custom header.
+     * @access public
+     * @return void
+     */
+    public function AddCustomHeader($custom_header) {
     $this->CustomHeader[] = explode(':', $custom_header, 2);
-  }
-
-  /**
-   * Evaluates the message and returns modifications for inline images and backgrounds
-   * @access public
-   * @return $message
-   */
-  public function MsgHTML($message, $basedir = '') {
+    }
+
+    /**
+     * Evaluates the message and returns modifications for inline images and backgrounds
+     * @access public
+     * @return $message
+     */
+    public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
     if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+        foreach($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
         if (!preg_match('#^[A-z]+://#',$url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+            $filename = basename($url);
+            $directory = dirname($url);
+            ($directory == '.')?$directory='':'';
+            $cid = 'cid:' . md5($filename);
+            $ext = pathinfo($filename, PATHINFO_EXTENSION);
+            $mimeType  = self::_mime_types($ext);
+            if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
+            if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
+            if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
+            }
+        }
         }
-      }
     }
     $this->IsHTML(true);
     $this->Body = $message;
     $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
     if (!empty($textMsg) && empty($this->AltBody)) {
-      $this->AltBody = html_entity_decode($textMsg);
+        $this->AltBody = html_entity_decode($textMsg);
     }
     if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
-    }
-  }
-
-  /**
-   * Gets the MIME type of the embedded or inline image
-   * @param string File extension
-   * @access public
-   * @return string MIME type of ext
-   * @static
-   */
-  public static function _mime_types($ext = '') {
+        $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+    }
+    }
+
+    /**
+     * Gets the MIME type of the embedded or inline image
+     * @param string File extension
+     * @access public
+     * @return string MIME type of ext
+     * @static
+     */
+    public static function _mime_types($ext = '') {
     $mimes = array(
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'doc'   =>  'application/msword',
-      'bin'   =>  'application/macbinary',
-      'dms'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'class' =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php'   =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php3'  =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xhtml' =>  'application/xhtml+xml',
-      'xht'   =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mpga'  =>  'audio/mpeg',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'txt'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'log'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'qt'    =>  'video/quicktime',
-      'mov'   =>  'video/quicktime',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'xl'    =>  'application/excel',
-      'eml'   =>  'message/rfc822'
+        'hqx'   =>  'application/mac-binhex40',
+        'cpt'   =>  'application/mac-compactpro',
+        'doc'   =>  'application/msword',
+        'bin'   =>  'application/macbinary',
+        'dms'   =>  'application/octet-stream',
+        'lha'   =>  'application/octet-stream',
+        'lzh'   =>  'application/octet-stream',
+        'exe'   =>  'application/octet-stream',
+        'class' =>  'application/octet-stream',
+        'psd'   =>  'application/octet-stream',
+        'so'    =>  'application/octet-stream',
+        'sea'   =>  'application/octet-stream',
+        'dll'   =>  'application/octet-stream',
+        'oda'   =>  'application/oda',
+        'pdf'   =>  'application/pdf',
+        'ai'    =>  'application/postscript',
+        'eps'   =>  'application/postscript',
+        'ps'    =>  'application/postscript',
+        'smi'   =>  'application/smil',
+        'smil'  =>  'application/smil',
+        'mif'   =>  'application/vnd.mif',
+        'xls'   =>  'application/vnd.ms-excel',
+        'ppt'   =>  'application/vnd.ms-powerpoint',
+        'wbxml' =>  'application/vnd.wap.wbxml',
+        'wmlc'  =>  'application/vnd.wap.wmlc',
+        'dcr'   =>  'application/x-director',
+        'dir'   =>  'application/x-director',
+        'dxr'   =>  'application/x-director',
+        'dvi'   =>  'application/x-dvi',
+        'gtar'  =>  'application/x-gtar',
+        'php'   =>  'application/x-httpd-php',
+        'php4'  =>  'application/x-httpd-php',
+        'php3'  =>  'application/x-httpd-php',
+        'phtml' =>  'application/x-httpd-php',
+        'phps'  =>  'application/x-httpd-php-source',
+        'js'    =>  'application/x-javascript',
+        'swf'   =>  'application/x-shockwave-flash',
+        'sit'   =>  'application/x-stuffit',
+        'tar'   =>  'application/x-tar',
+        'tgz'   =>  'application/x-tar',
+        'xhtml' =>  'application/xhtml+xml',
+        'xht'   =>  'application/xhtml+xml',
+        'zip'   =>  'application/zip',
+        'mid'   =>  'audio/midi',
+        'midi'  =>  'audio/midi',
+        'mpga'  =>  'audio/mpeg',
+        'mp2'   =>  'audio/mpeg',
+        'mp3'   =>  'audio/mpeg',
+        'aif'   =>  'audio/x-aiff',
+        'aiff'  =>  'audio/x-aiff',
+        'aifc'  =>  'audio/x-aiff',
+        'ram'   =>  'audio/x-pn-realaudio',
+        'rm'    =>  'audio/x-pn-realaudio',
+        'rpm'   =>  'audio/x-pn-realaudio-plugin',
+        'ra'    =>  'audio/x-realaudio',
+        'rv'    =>  'video/vnd.rn-realvideo',
+        'wav'   =>  'audio/x-wav',
+        'bmp'   =>  'image/bmp',
+        'gif'   =>  'image/gif',
+        'jpeg'  =>  'image/jpeg',
+        'jpg'   =>  'image/jpeg',
+        'jpe'   =>  'image/jpeg',
+        'png'   =>  'image/png',
+        'tiff'  =>  'image/tiff',
+        'tif'   =>  'image/tiff',
+        'css'   =>  'text/css',
+        'html'  =>  'text/html',
+        'htm'   =>  'text/html',
+        'shtml' =>  'text/html',
+        'txt'   =>  'text/plain',
+        'text'  =>  'text/plain',
+        'log'   =>  'text/plain',
+        'rtx'   =>  'text/richtext',
+        'rtf'   =>  'text/rtf',
+        'xml'   =>  'text/xml',
+        'xsl'   =>  'text/xml',
+        'mpeg'  =>  'video/mpeg',
+        'mpg'   =>  'video/mpeg',
+        'mpe'   =>  'video/mpeg',
+        'qt'    =>  'video/quicktime',
+        'mov'   =>  'video/quicktime',
+        'avi'   =>  'video/x-msvideo',
+        'movie' =>  'video/x-sgi-movie',
+        'doc'   =>  'application/msword',
+        'word'  =>  'application/msword',
+        'xl'    =>  'application/excel',
+        'eml'   =>  'message/rfc822'
     );
     return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
-  }
-
-  /**
-  * Set (or reset) Class Objects (variables)
-  *
-  * Usage Example:
-  * $page->set('X-Priority', '3');
-  *
-  * @access public
-  * @param string $name Parameter Name
-  * @param mixed $value Parameter Value
-  * NOTE: will not work with arrays, there are no arrays to set/reset
-  * @todo Should this not be using __set() magic function?
-  */
-  public function set($name, $value = '') {
+    }
+
+    /**
+     * Set (or reset) Class Objects (variables)
+     *
+     * Usage Example:
+     * $page->set('X-Priority', '3');
+     *
+     * @access public
+     * @param string $name Parameter Name
+     * @param mixed $value Parameter Value
+     * NOTE: will not work with arrays, there are no arrays to set/reset
+     * @todo Should this not be using __set() magic function?
+     */
+    public function set($name, $value = '') {
     try {
-      if (isset($this->$name) ) {
+        if (isset($this->$name) ) {
         $this->$name = $value;
-      } else {
+        } else {
         throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
-      }
+        }
     } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
+        $this->SetError($e->getMessage());
+        if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
-      }
+        }
     }
     return true;
-  }
-
-  /**
-   * Strips newlines to prevent header injection.
-   * @access public
-   * @param string $str String
-   * @return string
-   */
-  public function SecureHeader($str) {
+    }
+
+    /**
+     * Strips newlines to prevent header injection.
+     * @access public
+     * @param string $str String
+     * @return string
+     */
+    public function SecureHeader($str) {
     $str = str_replace("\r", '', $str);
     $str = str_replace("\n", '', $str);
     return trim($str);
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function Sign($cert_filename, $key_filename, $key_pass) {
+    }
+
+    /**
+     * Set the private key file and password to sign the message.
+     *
+     * @access public
+     * @param string $key_filename Parameter File Name
+     * @param string $key_pass Password for private key
+     */
+    public function Sign($cert_filename, $key_filename, $key_pass) {
     $this->sign_cert_file = $cert_filename;
     $this->sign_key_file = $key_filename;
     $this->sign_key_pass = $key_pass;
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function DKIM_QP($txt) {
+    }
+
+    /**
+     * Set the private key file and password to sign the message.
+     *
+     * @access public
+     * @param string $key_filename Parameter File Name
+     * @param string $key_pass Password for private key
+     */
+    public function DKIM_QP($txt) {
     $tmp="";
     $line="";
     for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
+        $ord=ord($txt[$i]);
+        if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
         $line.=$txt[$i];
-      } else {
+        } else {
         $line.="=".sprintf("%02X",$ord);
-      }
+        }
     }
     return $line;
-  }
-
-  /**
-   * Generate DKIM signature
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_Sign($s) {
+    }
+
+    /**
+     * Generate DKIM signature
+     *
+     * @access public
+     * @param string $s Header
+     */
+    public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
     if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+        $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
     } else {
-      $privKey = $privKeyStr;
+        $privKey = $privKeyStr;
     }
     if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
+        return base64_encode($signature);
+    }
     }
-  }
 
-  /**
-   * Generate DKIM Canonicalization Header
-   *
-   * @access public
-   * @param string $s Header
-   */
-  public function DKIM_HeaderC($s) {
+    /**
+     * Generate DKIM Canonicalization Header
+     *
+     * @access public
+     * @param string $s Header
+     */
+    public function DKIM_HeaderC($s) {
     $s=preg_replace("/\r\n\s+/"," ",$s);
     $lines=explode("\r\n",$s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+        list($heading,$value)=explode(":",$line,2);
+        $heading=strtolower($heading);
+        $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
+        $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
     }
     $s=implode("\r\n",$lines);
     return $s;
-  }
-
-  /**
-   * Generate DKIM Canonicalization Body
-   *
-   * @access public
-   * @param string $body Message Body
-   */
-  public function DKIM_BodyC($body) {
+    }
+
+    /**
+     * Generate DKIM Canonicalization Body
+     *
+     * @access public
+     * @param string $body Message Body
+     */
+    public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
     $body=str_replace("\r\n","\n",$body);
     $body=str_replace("\n","\r\n",$body);
     // END stabilize line endings
     while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+        $body=substr($body,0,strlen($body)-2);
     }
     return $body;
-  }
-
-  /**
-   * Create the DKIM header, body, as new header
-   *
-   * @access public
-   * @param string $headers_line Header lines
-   * @param string $subject Subject
-   * @param string $body Body
-   */
-  public function DKIM_Add($headers_line,$subject,$body) {
+    }
+
+    /**
+     * Create the DKIM header, body, as new header
+     *
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     */
+    public function DKIM_Add($headers_line,$subject,$body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
@@ -2291,11 +2291,11 @@  discard block
 block discarded – undo
     $subject_header       = "Subject: $subject";
     $headers              = explode("\r\n",$headers_line);
     foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
+        if (strpos($header,'From:') === 0) {
         $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
+        } elseif (strpos($header,'To:') === 0) {
         $to_header=$header;
-      }
+        }
     }
     $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
     $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
@@ -2316,20 +2316,20 @@  discard block
 block discarded – undo
     $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
-  }
+    }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+    protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+        $params = array($isSent,$to,$cc,$bcc,$subject,$body);
+        call_user_func_array($this->action_function,$params);
+    }
     }
-  }
 }
 
 class phpmailerException extends Exception {
-  public function errorMessage() {
+    public function errorMessage() {
     $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
     return $errorMsg;
-  }
+    }
 }
 ?>

Please login to merge, or discard this patch.

main/inc/lib/array.lib.php 1 patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -108,24 +108,24 @@
 block discarded – undo
  */
 function utf8_sort($array)
 {
-	$old_locale = setlocale(LC_ALL, null);
-	$code = api_get_language_isocode();
-	$locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
-	$try_sort = false;
+    $old_locale = setlocale(LC_ALL, null);
+    $code = api_get_language_isocode();
+    $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
+    $try_sort = false;
 
-	foreach($locale_list as $locale) {
-		$my_local = setlocale(LC_COLLATE, $locale);
-		if ($my_local) {
-			$try_sort = true;
-			break;
-		}
-	}
+    foreach($locale_list as $locale) {
+        $my_local = setlocale(LC_COLLATE, $locale);
+        if ($my_local) {
+            $try_sort = true;
+            break;
+        }
+    }
 
-	if ($try_sort) {
-		uasort($array, 'strcoll');
-	}
-	setlocale(LC_COLLATE, $old_locale);
-	return $array;
+    if ($try_sort) {
+        uasort($array, 'strcoll');
+    }
+    setlocale(LC_COLLATE, $old_locale);
+    return $array;
 }
 
 /**

Please login to merge, or discard this patch.

main/inc/lib/legal.lib.php 1 patch

Indentation +121 added lines, -121 removed lines patch added patch discarded remove patch

@@ -15,15 +15,15 @@  discard block
 block discarded – undo
     {
     }
 
-	/**
-	 * Add a new Term and Condition
-	 * @param int $language language id
-	 * @param string $content content
-	 * @param int $type term and condition type (0 or 1)
-	 * @param string $changes explain changes
-	 * @return boolean success
-	 */
-	public static function add($language, $content, $type, $changes)
+    /**
+     * Add a new Term and Condition
+     * @param int $language language id
+     * @param string $content content
+     * @param int $type term and condition type (0 or 1)
+     * @param string $changes explain changes
+     * @return boolean success
+     */
+    public static function add($language, $content, $type, $changes)
     {
         $legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $last = self::get_last_condition($language);
@@ -60,62 +60,62 @@  discard block
 block discarded – undo
         }
     }
 
-	public static function delete($id)
+    public static function delete($id)
     {
-		/*
+        /*
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$id = intval($id);
 		$sql = "DELETE FROM $legal_table WHERE legal_id = '".$id."'";
 		*/
-	}
-
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition_version($language)
+    }
+
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition_version($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT version FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
-		$result = Database::query($sql);
-		$row = Database::fetch_array($result);
+        $result = Database::query($sql);
+        $row = Database::fetch_array($result);
         if (Database::num_rows($result) > 0) {
 
-			return $row['version'];
-		} else {
+            return $row['version'];
+        } else {
 
-			return 0;
-		}
-	}
+            return 0;
+        }
+    }
 
-	/**
-	 * Gets the data of a Term and condition by language
-	 * @param int $language language id
-	 * @return array all the info of a Term and condition
-	 */
-	public static function get_last_condition ($language)
+    /**
+     * Gets the data of a Term and condition by language
+     * @param int $language language id
+     * @return array all the info of a Term and condition
+     */
+    public static function get_last_condition ($language)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
-		$sql = "SELECT * FROM $legal_conditions_table
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $language= Database::escape_string($language);
+        $sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
                 LIMIT 1 ";
-		$result = Database::query($sql);
+        $result = Database::query($sql);
 
-		return Database::fetch_array($result);
-	}
+        return Database::fetch_array($result);
+    }
 
-	/**
-	 * Gets the last version of a Term and condition by language
-	 * @param int $language language id
-	 * @return boolean | int the version or false if does not exist
-	 */
-	public static function get_last_version($language)
+    /**
+     * Gets the last version of a Term and condition by language
+     * @param int $language language id
+     * @return boolean | int the version or false if does not exist
+     */
+    public static function get_last_version($language)
     {
         $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
         $language = intval($language);
@@ -133,15 +133,15 @@  discard block
 block discarded – undo
 
             return false;
         }
-	}
+    }
 
-	/**
-	 * Show the last condition
-	 * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
+    /**
+     * Show the last condition
+     * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
      *
-	 * @return string html preview
-	 */
-	public static function show_last_condition($term_preview)
+     * @return string html preview
+     */
+    public static function show_last_condition($term_preview)
     {
         $preview = '';
         switch ($term_preview['type']) {
@@ -167,80 +167,80 @@  discard block
 block discarded – undo
             default:
                 break;
         }
-		return 	$preview;
-	}
-
-	/**
-	 * Get the terms and condition table (only for maintenance)
-	 * @param int offset
-	 * @param int number of items
-	 * @param int column
-	 * @return array
-	 */
-	public static function get_legal_data($from, $number_of_items, $column)
+        return 	$preview;
+    }
+
+    /**
+     * Get the terms and condition table (only for maintenance)
+     * @param int offset
+     * @param int number of items
+     * @param int column
+     * @return array
+     */
+    public static function get_legal_data($from, $number_of_items, $column)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-		$from = intval($from);
-		$number_of_items = intval($number_of_items);
-		$column = intval($column);
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
+        $from = intval($from);
+        $number_of_items = intval($number_of_items);
+        $column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+            $sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
-		$sql .= "ORDER BY language, version ASC ";
-		$sql .= "LIMIT $from, $number_of_items ";
-
-		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
-		while ($legal = Database::fetch_array($result)) {
-			// max 2000 chars
-			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
-			$legals[] = $legal;
-		}
-		return $legals;
-	}
-
-	/**
-	 * Gets the number of terms and conditions available
-	 * @return int
-	 */
-	public static function count()
+        $sql .= "ORDER BY language, version ASC ";
+        $sql .= "LIMIT $from, $number_of_items ";
+
+        $result = Database::query($sql);
+        $legals = array ();
+        $versions = array ();
+        while ($legal = Database::fetch_array($result)) {
+            // max 2000 chars
+            //echo strlen($legal[1]); echo '<br>';
+            $versions[]=$legal[0];
+            $languages[]=$legal[1];
+            if (strlen($legal[2])>2000)
+                $legal[2]= substr($legal[2],0,2000).' ... ';
+            if ($legal[4]==0)
+                $legal[4]= get_lang('HTMLText');
+            elseif($legal[4]==1)
+                $legal[4]=get_lang('PageLink');
+            $legals[] = $legal;
+        }
+        return $legals;
+    }
+
+    /**
+     * Gets the number of terms and conditions available
+     * @return int
+     */
+    public static function count()
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$sql = "SELECT count(*) as count_result
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $sql = "SELECT count(*) as count_result
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
-		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
-		$result = $url['count_result'];
-
-		return $result;
-	}
-
-	/**
-	 * Get type of terms and conditions
-	 * @param int The legal id
-	 * @param int The language id
-	 * @return int The current type of terms and conditions
-	 */
-	public static function get_type_of_terms_and_conditions($legal_id, $language_id)
+        $result = Database::query($sql);
+        $url = Database::fetch_array($result,'ASSOC');
+        $result = $url['count_result'];
+
+        return $result;
+    }
+
+    /**
+     * Get type of terms and conditions
+     * @param int The legal id
+     * @param int The language id
+     * @return int The current type of terms and conditions
+     */
+    public static function get_type_of_terms_and_conditions($legal_id, $language_id)
     {
-		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$legal_id = intval($legal_id);
-		$language_id = intval($language_id);
-		$sql = 'SELECT type FROM '.$legal_conditions_table.'
+        $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
+        $legal_id = intval($legal_id);
+        $language_id = intval($language_id);
+        $sql = 'SELECT type FROM '.$legal_conditions_table.'
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
-		$rs = Database::query($sql);
+        $rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
-	}
+        return Database::result($rs,0,'type');
+    }
 }

Please login to merge, or discard this patch.

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56
57	57	DocumentManager::file_send_for_download($filePath, true, $filename.'.csv');
58	58	exit;
59		- }
	59	+ }
60	60
61	61	/**
62	62	* Export tabular data to XLS-file
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79
80	80	DocumentManager::file_send_for_download($filePath, true, $filename.'.xlsx');
81	81	exit;
82		- }
	82	+ }
83	83
84	84	/**
85	85	* Export tabular data to XLS-file (as html table)
		@@ -112,13 +112,13 @@ discard block
		block discarded – undo
112	112	}
113	113
114	114	/**
115		- * Export tabular data to XML-file
116		- * @param array Simple array of data to put in XML
117		- * @param string Name of file to be given to the user
118		- * @param string Name of common tag to place each line in
119		- * @param string Name of the root element. A root element should always be given.
120		- * @param string Encoding in which the data is provided
121		- */
	115	+ * Export tabular data to XML-file
	116	+ * @param array Simple array of data to put in XML
	117	+ * @param string Name of file to be given to the user
	118	+ * @param string Name of common tag to place each line in
	119	+ * @param string Name of the root element. A root element should always be given.
	120	+ * @param string Encoding in which the data is provided
	121	+ */
122	122	public static function arrayToXml(
123	123	$data,
124	124	$filename = 'export',
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	fclose($handle);
149	149	DocumentManager :: file_send_for_download($file, true, $filename.'.xml');
150	150	exit;
151		- }
	151	+ }
152	152
153	153	/**
154	154	* Export hierarchical tabular data to XML-file
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	foreach ($data as $row) {
198	198	$string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
199	199	if (is_array($row['value'])) {
200		- $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
	200	+ $string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
201	201	$string .= str_repeat("\t",$level).'</'.$row['name'].'>';
202	202	} else {
203	203	$string .= $row['value'];

		@@ -256,9 +256,9 @@ discard block
		block discarded – undo
256	256	}
257	257
258	258	/**
259		- * Is the browser from facebook?
260		- * @return boolean True if the browser is from facebook otherwise false
261		- */
	259	+ * Is the browser from facebook?
	260	+ * @return boolean True if the browser is from facebook otherwise false
	261	+ */
262	262	public function isFacebook()
263	263	{
264	264	return $this->_is_facebook;
		@@ -591,12 +591,12 @@ discard block
		block discarded – undo
591	591	}
592	592	return true;
593	593	} // Test for versions > IE 10
594		- else if(stripos($this->_agent, 'trident') !== false) {
595		- $this->setBrowser(self::BROWSER_IE);
596		- $result = explode('rv:', $this->_agent);
597		- $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
598		- $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
599		- } // Test for Pocket IE
	594	+ else if(stripos($this->_agent, 'trident') !== false) {
	595	+ $this->setBrowser(self::BROWSER_IE);
	596	+ $result = explode('rv:', $this->_agent);
	597	+ $this->setVersion(preg_replace('/[^0-9.]+/', '', $result[1]));
	598	+ $this->_agent = str_replace(array("Mozilla", "Gecko"), "MSIE", $this->_agent);
	599	+ } // Test for Pocket IE
600	600	else if (stripos($this->_agent, 'mspie') !== false \|\| stripos($this->_agent, 'pocket') !== false) {
601	601	$aresult = explode(' ', stristr($this->_agent, 'mspie'));
602	602	$this->setPlatform(self::PLATFORM_WINDOWS_CE);

		@@ -144,8 +144,8 @@ discard block
		block discarded – undo
144	144	}
145	145
146	146	/**
147		- * Generates an HTML Certificate and fills the path_certificate field in the DB
148		- **/
	147	+ * Generates an HTML Certificate and fills the path_certificate field in the DB
	148	+ **/
149	149	public function generate($params = array())
150	150	{
151	151	// The user directory should be set
		@@ -261,12 +261,12 @@ discard block
		block discarded – undo
261	261	}
262	262
263	263	/**
264		- * update user info about certificate
265		- * @param int $cat_id category id
266		- * @param int $user_id user id
267		- * @param string $path_certificate the path name of the certificate
268		- * @return void()
269		- */
	264	+ * update user info about certificate
	265	+ * @param int $cat_id category id
	266	+ * @param int $user_id user id
	267	+ * @param string $path_certificate the path name of the certificate
	268	+ * @return void()
	269	+ */
270	270	public function update_user_info_about_certificate(
271	271	$cat_id,
272	272	$user_id,
		@@ -368,13 +368,13 @@ discard block
		block discarded – undo
368	368	}
369	369
370	370	/**
371		- * Shows the student's certificate (HTML file). If the global setting
372		- * allow_public_certificates is set to 'false', no certificate can be printed.
373		- * If the global allow_public_certificates is set to 'true' and the course
374		- * setting allow_public_certificates is set to 0, no certificate *in this
375		- * course* can be printed (for anonymous users). Connected users can always
376		- * print them.
377		- */
	371	+ * Shows the student's certificate (HTML file). If the global setting
	372	+ * allow_public_certificates is set to 'false', no certificate can be printed.
	373	+ * If the global allow_public_certificates is set to 'true' and the course
	374	+ * setting allow_public_certificates is set to 0, no certificate *in this
	375	+ * course* can be printed (for anonymous users). Connected users can always
	376	+ * print them.
	377	+ */
378	378	public function show()
379	379	{
380	380	// Special rules for anonymous users

		@@ -60,103 +60,103 @@ discard block
		block discarded – undo
60	60	*/
61	61
62	62	class POP3 {
63		- /**
64		- * Default POP3 port
65		- * @var int
66		- */
67		- public $POP3_PORT = 110;
68		-
69		- /**
70		- * Default Timeout
71		- * @var int
72		- */
73		- public $POP3_TIMEOUT = 30;
74		-
75		- /**
76		- * POP3 Carriage Return + Line Feed
77		- * @var string
78		- */
79		- public $CRLF = "\r\n";
80		-
81		- /**
82		- * Displaying Debug warnings? (0 = now, 1+ = yes)
83		- * @var int
84		- */
85		- public $do_debug = 2;
86		-
87		- /**
88		- * POP3 Mail Server
89		- * @var string
90		- */
91		- public $host;
92		-
93		- /**
94		- * POP3 Port
95		- * @var int
96		- */
97		- public $port;
98		-
99		- /**
100		- * POP3 Timeout Value
101		- * @var int
102		- */
103		- public $tval;
104		-
105		- /**
106		- * POP3 Username
107		- * @var string
108		- */
109		- public $username;
110		-
111		- /**
112		- * POP3 Password
113		- * @var string
114		- */
115		- public $password;
116		-
117		- /////////////////////////////////////////////////
118		- // PROPERTIES, PRIVATE AND PROTECTED
119		- /////////////////////////////////////////////////
120		-
121		- private $pop_conn;
122		- private $connected;
123		- private $error; // Error log array
124		-
125		- /**
126		- * Constructor, sets the initial values
127		- * @access public
128		- * @return POP3
129		- */
130		- public function __construct() {
	63	+ /**
	64	+ * Default POP3 port
	65	+ * @var int
	66	+ */
	67	+ public $POP3_PORT = 110;
	68	+
	69	+ /**
	70	+ * Default Timeout
	71	+ * @var int
	72	+ */
	73	+ public $POP3_TIMEOUT = 30;
	74	+
	75	+ /**
	76	+ * POP3 Carriage Return + Line Feed
	77	+ * @var string
	78	+ */
	79	+ public $CRLF = "\r\n";
	80	+
	81	+ /**
	82	+ * Displaying Debug warnings? (0 = now, 1+ = yes)
	83	+ * @var int
	84	+ */
	85	+ public $do_debug = 2;
	86	+
	87	+ /**
	88	+ * POP3 Mail Server
	89	+ * @var string
	90	+ */
	91	+ public $host;
	92	+
	93	+ /**
	94	+ * POP3 Port
	95	+ * @var int
	96	+ */
	97	+ public $port;
	98	+
	99	+ /**
	100	+ * POP3 Timeout Value
	101	+ * @var int
	102	+ */
	103	+ public $tval;
	104	+
	105	+ /**
	106	+ * POP3 Username
	107	+ * @var string
	108	+ */
	109	+ public $username;
	110	+
	111	+ /**
	112	+ * POP3 Password
	113	+ * @var string
	114	+ */
	115	+ public $password;
	116	+
	117	+ /////////////////////////////////////////////////
	118	+ // PROPERTIES, PRIVATE AND PROTECTED
	119	+ /////////////////////////////////////////////////
	120	+
	121	+ private $pop_conn;
	122	+ private $connected;
	123	+ private $error; // Error log array
	124	+
	125	+ /**
	126	+ * Constructor, sets the initial values
	127	+ * @access public
	128	+ * @return POP3
	129	+ */
	130	+ public function __construct() {
131	131	$this->pop_conn = 0;
132	132	$this->connected = false;
133	133	$this->error = null;
134		- }
135		-
136		- /**
137		- * Combination of public events - connect, login, disconnect
138		- * @access public
139		- * @param string $host
140		- * @param integer $port
141		- * @param integer $tval
142		- * @param string $username
143		- * @param string $password
144		- */
145		- public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
	134	+ }
	135	+
	136	+ /**
	137	+ * Combination of public events - connect, login, disconnect
	138	+ * @access public
	139	+ * @param string $host
	140	+ * @param integer $port
	141	+ * @param integer $tval
	142	+ * @param string $username
	143	+ * @param string $password
	144	+ */
	145	+ public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
146	146	$this->host = $host;
147	147
148	148	// If no port value is passed, retrieve it
149	149	if ($port == false) {
150		- $this->port = $this->POP3_PORT;
	150	+ $this->port = $this->POP3_PORT;
151	151	} else {
152		- $this->port = $port;
	152	+ $this->port = $port;
153	153	}
154	154
155	155	// If no port value is passed, retrieve it
156	156	if ($tval == false) {
157		- $this->tval = $this->POP3_TIMEOUT;
	157	+ $this->tval = $this->POP3_TIMEOUT;
158	158	} else {
159		- $this->tval = $tval;
	159	+ $this->tval = $tval;
160	160	}
161	161
162	162	$this->do_debug = $debug_level;
		@@ -170,13 +170,13 @@ discard block
		block discarded – undo
170	170	$result = $this->Connect($this->host, $this->port, $this->tval);
171	171
172	172	if ($result) {
173		- $login_result = $this->Login($this->username, $this->password);
	173	+ $login_result = $this->Login($this->username, $this->password);
174	174
175		- if ($login_result) {
	175	+ if ($login_result) {
176	176	$this->Disconnect();
177	177
178	178	return true;
179		- }
	179	+ }
180	180
181	181	}
182	182
		@@ -184,20 +184,20 @@ discard block
		block discarded – undo
184	184	$this->Disconnect();
185	185
186	186	return false;
187		- }
188		-
189		- /**
190		- * Connect to the POP3 server
191		- * @access public
192		- * @param string $host
193		- * @param integer $port
194		- * @param integer $tval
195		- * @return boolean
196		- */
197		- public function Connect ($host, $port = false, $tval = 30) {
	187	+ }
	188	+
	189	+ /**
	190	+ * Connect to the POP3 server
	191	+ * @access public
	192	+ * @param string $host
	193	+ * @param integer $port
	194	+ * @param integer $tval
	195	+ * @return boolean
	196	+ */
	197	+ public function Connect ($host, $port = false, $tval = 30) {
198	198	// Are we already connected?
199	199	if ($this->connected) {
200		- return true;
	200	+ return true;
201	201	}
202	202
203	203	/*
		@@ -209,45 +209,45 @@ discard block
		block discarded – undo
209	209
210	210	// Connect to the POP3 server
211	211	$this->pop_conn = fsockopen($host, // POP3 Host
212		- $port, // Port #
213		- $errno, // Error Number
214		- $errstr, // Error Message
215		- $tval); // Timeout (seconds)
	212	+ $port, // Port #
	213	+ $errno, // Error Number
	214	+ $errstr, // Error Message
	215	+ $tval); // Timeout (seconds)
216	216
217	217	// Restore the error handler
218	218	restore_error_handler();
219	219
220	220	// Does the Error Log now contain anything?
221	221	if ($this->error && $this->do_debug >= 1) {
222		- $this->displayErrors();
	222	+ $this->displayErrors();
223	223	}
224	224
225	225	// Did we connect?
226	226	if ($this->pop_conn == false) {
227		- // It would appear not...
228		- $this->error = array(
	227	+ // It would appear not...
	228	+ $this->error = array(
229	229	'error' => "Failed to connect to server $host on port $port",
230	230	'errno' => $errno,
231	231	'errstr' => $errstr
232		- );
	232	+ );
233	233
234		- if ($this->do_debug >= 1) {
	234	+ if ($this->do_debug >= 1) {
235	235	$this->displayErrors();
236		- }
	236	+ }
237	237
238		- return false;
	238	+ return false;
239	239	}
240	240
241	241	// Increase the stream time-out
242	242
243	243	// Check for PHP 4.3.0 or later
244	244	if (version_compare(phpversion(), '5.0.0', 'ge')) {
245		- stream_set_timeout($this->pop_conn, $tval, 0);
	245	+ stream_set_timeout($this->pop_conn, $tval, 0);
246	246	} else {
247		- // Does not work on Windows
248		- if (substr(PHP_OS, 0, 3) !== 'WIN') {
	247	+ // Does not work on Windows
	248	+ if (substr(PHP_OS, 0, 3) !== 'WIN') {
249	249	socket_set_timeout($this->pop_conn, $tval, 0);
250		- }
	250	+ }
251	251	}
252	252
253	253	// Get the POP3 server response
		@@ -257,33 +257,33 @@ discard block
		block discarded – undo
257	257	if ($this->checkResponse($pop3_response)) {
258	258	// The connection is established and the POP3 server is talking
259	259	$this->connected = true;
260		- return true;
	260	+ return true;
261	261	}
262	262
263		- }
	263	+ }
264	264
265		- /**
266		- * Login to the POP3 server (does not support APOP yet)
267		- * @access public
268		- * @param string $username
269		- * @param string $password
270		- * @return boolean
271		- */
272		- public function Login ($username = '', $password = '') {
	265	+ /**
	266	+ * Login to the POP3 server (does not support APOP yet)
	267	+ * @access public
	268	+ * @param string $username
	269	+ * @param string $password
	270	+ * @return boolean
	271	+ */
	272	+ public function Login ($username = '', $password = '') {
273	273	if ($this->connected == false) {
274		- $this->error = 'Not connected to POP3 server';
	274	+ $this->error = 'Not connected to POP3 server';
275	275
276		- if ($this->do_debug >= 1) {
	276	+ if ($this->do_debug >= 1) {
277	277	$this->displayErrors();
278		- }
	278	+ }
279	279	}
280	280
281	281	if (empty($username)) {
282		- $username = $this->username;
	282	+ $username = $this->username;
283	283	}
284	284
285	285	if (empty($password)) {
286		- $password = $this->password;
	286	+ $password = $this->password;
287	287	}
288	288
289	289	$pop_username = "USER $username" . $this->CRLF;
		@@ -294,114 +294,114 @@ discard block
		block discarded – undo
294	294	$pop3_response = $this->getResponse();
295	295
296	296	if ($this->checkResponse($pop3_response)) {
297		- // Send the Password
298		- $this->sendString($pop_password);
299		- $pop3_response = $this->getResponse();
	297	+ // Send the Password
	298	+ $this->sendString($pop_password);
	299	+ $pop3_response = $this->getResponse();
300	300
301		- if ($this->checkResponse($pop3_response)) {
	301	+ if ($this->checkResponse($pop3_response)) {
302	302	return true;
303		- } else {
	303	+ } else {
304	304	return false;
305		- }
	305	+ }
306	306	} else {
307		- return false;
	307	+ return false;
	308	+ }
308	309	}
309		- }
310	310
311		- /**
312		- * Disconnect from the POP3 server
313		- * @access public
314		- */
315		- public function Disconnect () {
	311	+ /**
	312	+ * Disconnect from the POP3 server
	313	+ * @access public
	314	+ */
	315	+ public function Disconnect () {
316	316	$this->sendString('QUIT');
317	317
318	318	fclose($this->pop_conn);
319		- }
320		-
321		- /////////////////////////////////////////////////
322		- // Private Methods
323		- /////////////////////////////////////////////////
324		-
325		- /**
326		- * Get the socket response back.
327		- * $size is the maximum number of bytes to retrieve
328		- * @access private
329		- * @param integer $size
330		- * @return string
331		- */
332		- private function getResponse ($size = 128) {
	319	+ }
	320	+
	321	+ /////////////////////////////////////////////////
	322	+ // Private Methods
	323	+ /////////////////////////////////////////////////
	324	+
	325	+ /**
	326	+ * Get the socket response back.
	327	+ * $size is the maximum number of bytes to retrieve
	328	+ * @access private
	329	+ * @param integer $size
	330	+ * @return string
	331	+ */
	332	+ private function getResponse ($size = 128) {
333	333	$pop3_response = fgets($this->pop_conn, $size);
334	334
335	335	return $pop3_response;
336		- }
337		-
338		- /**
339		- * Send a string down the open socket connection to the POP3 server
340		- * @access private
341		- * @param string $string
342		- * @return integer
343		- */
344		- private function sendString ($string) {
	336	+ }
	337	+
	338	+ /**
	339	+ * Send a string down the open socket connection to the POP3 server
	340	+ * @access private
	341	+ * @param string $string
	342	+ * @return integer
	343	+ */
	344	+ private function sendString ($string) {
345	345	$bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
346	346
347	347	return $bytes_sent;
348		- }
349		-
350		- /**
351		- * Checks the POP3 server response for +OK or -ERR
352		- * @access private
353		- * @param string $string
354		- * @return boolean
355		- */
356		- private function checkResponse ($string) {
	348	+ }
	349	+
	350	+ /**
	351	+ * Checks the POP3 server response for +OK or -ERR
	352	+ * @access private
	353	+ * @param string $string
	354	+ * @return boolean
	355	+ */
	356	+ private function checkResponse ($string) {
357	357	if (substr($string, 0, 3) !== '+OK') {
358		- $this->error = array(
	358	+ $this->error = array(
359	359	'error' => "Server reported an error: $string",
360	360	'errno' => 0,
361	361	'errstr' => ''
362		- );
	362	+ );
363	363
364		- if ($this->do_debug >= 1) {
	364	+ if ($this->do_debug >= 1) {
365	365	$this->displayErrors();
366		- }
	366	+ }
367	367
368		- return false;
	368	+ return false;
369	369	} else {
370		- return true;
	370	+ return true;
371	371	}
372	372
373		- }
	373	+ }
374	374
375		- /**
376		- * If debug is enabled, display the error message array
377		- * @access private
378		- */
379		- private function displayErrors () {
	375	+ /**
	376	+ * If debug is enabled, display the error message array
	377	+ * @access private
	378	+ */
	379	+ private function displayErrors () {
380	380	echo '<pre>';
381	381
382	382	foreach ($this->error as $single_error) {
383		- print_r($single_error);
	383	+ print_r($single_error);
384	384	}
385	385
386	386	echo '</pre>';
387		- }
388		-
389		- /**
390		- * Takes over from PHP for the socket warning handler
391		- * @access private
392		- * @param integer $errno
393		- * @param string $errstr
394		- * @param string $errfile
395		- * @param integer $errline
396		- */
397		- private function catchWarning ($errno, $errstr, $errfile, $errline) {
	387	+ }
	388	+
	389	+ /**
	390	+ * Takes over from PHP for the socket warning handler
	391	+ * @access private
	392	+ * @param integer $errno
	393	+ * @param string $errstr
	394	+ * @param string $errfile
	395	+ * @param integer $errline
	396	+ */
	397	+ private function catchWarning ($errno, $errstr, $errfile, $errline) {
398	398	$this->error[] = array(
399		- 'error' => "Connecting to the POP3 server raised a PHP warning: ",
400		- 'errno' => $errno,
401		- 'errstr' => $errstr
	399	+ 'error' => "Connecting to the POP3 server raised a PHP warning: ",
	400	+ 'errno' => $errno,
	401	+ 'errstr' => $errstr
402	402	);
403		- }
	403	+ }
404	404
405		- // End of class
	405	+ // End of class
406	406	}
407	407	?>
408	408	\ No newline at end of file

		@@ -19,7 +19,7 @@
		block discarded – undo
19	19	$PHPMAILER_LANG['mailer_not_supported'] = ' mailer غير مدعوم.';
20	20	//$PHPMAILER_LANG['provide_address'] = 'You must provide at least one recipient email address.';
21	21	$PHPMAILER_LANG['recipients_failed'] = 'SMTP Error: الأخطاء التالية ' .
22		- 'فشل في الارسال لكل من : ';
	22	+ 'فشل في الارسال لكل من : ';
23	23	$PHPMAILER_LANG['signing'] = 'خطأ في التوقيع: ';
24	24	//$PHPMAILER_LANG['smtp_connect_failed'] = 'SMTP Connect() failed.';
25	25	//$PHPMAILER_LANG['smtp_error'] = 'SMTP server error: ';

		@@ -108,24 +108,24 @@
		block discarded – undo
108	108	*/
109	109	function utf8_sort($array)
110	110	{
111		- $old_locale = setlocale(LC_ALL, null);
112		- $code = api_get_language_isocode();
113		- $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
114		- $try_sort = false;
	111	+ $old_locale = setlocale(LC_ALL, null);
	112	+ $code = api_get_language_isocode();
	113	+ $locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
	114	+ $try_sort = false;
115	115
116		- foreach($locale_list as $locale) {
117		- $my_local = setlocale(LC_COLLATE, $locale);
118		- if ($my_local) {
119		- $try_sort = true;
120		- break;
121		- }
122		- }
	116	+ foreach($locale_list as $locale) {
	117	+ $my_local = setlocale(LC_COLLATE, $locale);
	118	+ if ($my_local) {
	119	+ $try_sort = true;
	120	+ break;
	121	+ }
	122	+ }
123	123
124		- if ($try_sort) {
125		- uasort($array, 'strcoll');
126		- }
127		- setlocale(LC_COLLATE, $old_locale);
128		- return $array;
	124	+ if ($try_sort) {
	125	+ uasort($array, 'strcoll');
	126	+ }
	127	+ setlocale(LC_COLLATE, $old_locale);
	128	+ return $array;
129	129	}
130	130
131	131	/**

		@@ -15,15 +15,15 @@ discard block
		block discarded – undo
15	15	{
16	16	}
17	17
18		- /**
19		- * Add a new Term and Condition
20		- * @param int $language language id
21		- * @param string $content content
22		- * @param int $type term and condition type (0 or 1)
23		- * @param string $changes explain changes
24		- * @return boolean success
25		- */
26		- public static function add($language, $content, $type, $changes)
	18	+ /**
	19	+ * Add a new Term and Condition
	20	+ * @param int $language language id
	21	+ * @param string $content content
	22	+ * @param int $type term and condition type (0 or 1)
	23	+ * @param string $changes explain changes
	24	+ * @return boolean success
	25	+ */
	26	+ public static function add($language, $content, $type, $changes)
27	27	{
28	28	$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
29	29	$last = self::get_last_condition($language);
		@@ -60,62 +60,62 @@ discard block
		block discarded – undo
60	60	}
61	61	}
62	62
63		- public static function delete($id)
	63	+ public static function delete($id)
64	64	{
65		- /*
	65	+ /*
66	66	$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
67	67	$id = intval($id);
68	68	$sql = "DELETE FROM $legal_table WHERE legal_id = '".$id."'";
69	69	*/
70		- }
71		-
72		- /**
73		- * Gets the last version of a Term and condition by language
74		- * @param int $language language id
75		- * @return array all the info of a Term and condition
76		- */
77		- public static function get_last_condition_version($language)
	70	+ }
	71	+
	72	+ /**
	73	+ * Gets the last version of a Term and condition by language
	74	+ * @param int $language language id
	75	+ * @return array all the info of a Term and condition
	76	+ */
	77	+ public static function get_last_condition_version($language)
78	78	{
79		- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
80		- $language= Database::escape_string($language);
81		- $sql = "SELECT version FROM $legal_conditions_table
	79	+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
	80	+ $language= Database::escape_string($language);
	81	+ $sql = "SELECT version FROM $legal_conditions_table
82	82	WHERE language_id = '".$language."'
83	83	ORDER BY legal_id DESC LIMIT 1 ";
84		- $result = Database::query($sql);
85		- $row = Database::fetch_array($result);
	84	+ $result = Database::query($sql);
	85	+ $row = Database::fetch_array($result);
86	86	if (Database::num_rows($result) > 0) {
87	87
88		- return $row['version'];
89		- } else {
	88	+ return $row['version'];
	89	+ } else {
90	90
91		- return 0;
92		- }
93		- }
	91	+ return 0;
	92	+ }
	93	+ }
94	94
95		- /**
96		- * Gets the data of a Term and condition by language
97		- * @param int $language language id
98		- * @return array all the info of a Term and condition
99		- */
100		- public static function get_last_condition ($language)
	95	+ /**
	96	+ * Gets the data of a Term and condition by language
	97	+ * @param int $language language id
	98	+ * @return array all the info of a Term and condition
	99	+ */
	100	+ public static function get_last_condition ($language)
101	101	{
102		- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
103		- $language= Database::escape_string($language);
104		- $sql = "SELECT * FROM $legal_conditions_table
	102	+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
	103	+ $language= Database::escape_string($language);
	104	+ $sql = "SELECT * FROM $legal_conditions_table
105	105	WHERE language_id = '".$language."'
106	106	ORDER BY version DESC
107	107	LIMIT 1 ";
108		- $result = Database::query($sql);
	108	+ $result = Database::query($sql);
109	109
110		- return Database::fetch_array($result);
111		- }
	110	+ return Database::fetch_array($result);
	111	+ }
112	112
113		- /**
114		- * Gets the last version of a Term and condition by language
115		- * @param int $language language id
116		- * @return boolean \| int the version or false if does not exist
117		- */
118		- public static function get_last_version($language)
	113	+ /**
	114	+ * Gets the last version of a Term and condition by language
	115	+ * @param int $language language id
	116	+ * @return boolean \| int the version or false if does not exist
	117	+ */
	118	+ public static function get_last_version($language)
119	119	{
120	120	$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
121	121	$language = intval($language);
		@@ -133,15 +133,15 @@ discard block
		block discarded – undo
133	133
134	134	return false;
135	135	}
136		- }
	136	+ }
137	137
138		- /**
139		- * Show the last condition
140		- * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
	138	+ /**
	139	+ * Show the last condition
	140	+ * @param array with type and content i.e array('type'=>'1', 'content'=>'hola');
141	141	*
142		- * @return string html preview
143		- */
144		- public static function show_last_condition($term_preview)
	142	+ * @return string html preview
	143	+ */
	144	+ public static function show_last_condition($term_preview)
145	145	{
146	146	$preview = '';
147	147	switch ($term_preview['type']) {
		@@ -167,80 +167,80 @@ discard block
		block discarded – undo
167	167	default:
168	168	break;
169	169	}
170		- return $preview;
171		- }
172		-
173		- /**
174		- * Get the terms and condition table (only for maintenance)
175		- * @param int offset
176		- * @param int number of items
177		- * @param int column
178		- * @return array
179		- */
180		- public static function get_legal_data($from, $number_of_items, $column)
	170	+ return $preview;
	171	+ }
	172	+
	173	+ /**
	174	+ * Get the terms and condition table (only for maintenance)
	175	+ * @param int offset
	176	+ * @param int number of items
	177	+ * @param int column
	178	+ * @return array
	179	+ */
	180	+ public static function get_legal_data($from, $number_of_items, $column)
181	181	{
182		- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
183		- $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
184		- $from = intval($from);
185		- $number_of_items = intval($number_of_items);
186		- $column = intval($column);
	182	+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
	183	+ $lang_table = Database::get_main_table(TABLE_MAIN_LANGUAGE);
	184	+ $from = intval($from);
	185	+ $number_of_items = intval($number_of_items);
	186	+ $column = intval($column);
187	187
188		- $sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
	188	+ $sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
189	189	FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
190		- $sql .= "ORDER BY language, version ASC ";
191		- $sql .= "LIMIT $from, $number_of_items ";
192		-
193		- $result = Database::query($sql);
194		- $legals = array ();
195		- $versions = array ();
196		- while ($legal = Database::fetch_array($result)) {
197		- // max 2000 chars
198		- //echo strlen($legal[1]); echo '<br>';
199		- $versions[]=$legal[0];
200		- $languages[]=$legal[1];
201		- if (strlen($legal[2])>2000)
202		- $legal[2]= substr($legal[2],0,2000).' ... ';
203		- if ($legal[4]==0)
204		- $legal[4]= get_lang('HTMLText');
205		- elseif($legal[4]==1)
206		- $legal[4]=get_lang('PageLink');
207		- $legals[] = $legal;
208		- }
209		- return $legals;
210		- }
211		-
212		- /**
213		- * Gets the number of terms and conditions available
214		- * @return int
215		- */
216		- public static function count()
	190	+ $sql .= "ORDER BY language, version ASC ";
	191	+ $sql .= "LIMIT $from, $number_of_items ";
	192	+
	193	+ $result = Database::query($sql);
	194	+ $legals = array ();
	195	+ $versions = array ();
	196	+ while ($legal = Database::fetch_array($result)) {
	197	+ // max 2000 chars
	198	+ //echo strlen($legal[1]); echo '<br>';
	199	+ $versions[]=$legal[0];
	200	+ $languages[]=$legal[1];
	201	+ if (strlen($legal[2])>2000)
	202	+ $legal[2]= substr($legal[2],0,2000).' ... ';
	203	+ if ($legal[4]==0)
	204	+ $legal[4]= get_lang('HTMLText');
	205	+ elseif($legal[4]==1)
	206	+ $legal[4]=get_lang('PageLink');
	207	+ $legals[] = $legal;
	208	+ }
	209	+ return $legals;
	210	+ }
	211	+
	212	+ /**
	213	+ * Gets the number of terms and conditions available
	214	+ * @return int
	215	+ */
	216	+ public static function count()
217	217	{
218		- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
219		- $sql = "SELECT count(*) as count_result
	218	+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
	219	+ $sql = "SELECT count(*) as count_result
220	220	FROM $legal_conditions_table
221	221	ORDER BY legal_id DESC ";
222		- $result = Database::query($sql);
223		- $url = Database::fetch_array($result,'ASSOC');
224		- $result = $url['count_result'];
225		-
226		- return $result;
227		- }
228		-
229		- /**
230		- * Get type of terms and conditions
231		- * @param int The legal id
232		- * @param int The language id
233		- * @return int The current type of terms and conditions
234		- */
235		- public static function get_type_of_terms_and_conditions($legal_id, $language_id)
	222	+ $result = Database::query($sql);
	223	+ $url = Database::fetch_array($result,'ASSOC');
	224	+ $result = $url['count_result'];
	225	+
	226	+ return $result;
	227	+ }
	228	+
	229	+ /**
	230	+ * Get type of terms and conditions
	231	+ * @param int The legal id
	232	+ * @param int The language id
	233	+ * @return int The current type of terms and conditions
	234	+ */
	235	+ public static function get_type_of_terms_and_conditions($legal_id, $language_id)
236	236	{
237		- $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
238		- $legal_id = intval($legal_id);
239		- $language_id = intval($language_id);
240		- $sql = 'SELECT type FROM '.$legal_conditions_table.'
	237	+ $legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
	238	+ $legal_id = intval($legal_id);
	239	+ $language_id = intval($language_id);
	240	+ $sql = 'SELECT type FROM '.$legal_conditions_table.'
241	241	WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
242		- $rs = Database::query($sql);
	242	+ $rs = Database::query($sql);
243	243
244		- return Database::result($rs,0,'type');
245		- }
	244	+ return Database::result($rs,0,'type');
	245	+ }
246	246	}

chamilo / chamilo-lms

Push — 1.10.x ( 9d3ef5...048bd3 )

Status

Category

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +429 added lines, -429 removed lines patch added patch discarded remove patch

Indentation +203 added lines, -203 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1454 added lines, -1454 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +121 added lines, -121 removed lines patch added patch discarded remove patch