winframework / winphp

lib/vendor/phpmailer/class.phpmailer.php

Doc Comments +15 added lines, -3 removed lines

@@ -890,6 +890,7 @@ 
 	/**

 	 * Creates recipient headers.

 	 * @access public

+	 * @param string $type
 	 * @return string

 	 */

 	public function AddrAppend($type, $addr) {

@@ -1256,6 +1257,9 @@ 
 	/**

 	 * Returns the start of a message boundary.

 	 * @access private

+	 * @param string $charSet
+	 * @param string $contentType
+	 * @param string $encoding
 	 */

 	private function GetBoundary($boundary, $charSet, $contentType, $encoding) {

 		$result = '';

@@ -1309,6 +1313,7 @@ 
 	/**

 	 * Returns a formatted header line.

 	 * @access public

+	 * @param string $name
 	 * @return string

 	 */

 	public function HeaderLine($name, $value) {

@@ -1318,6 +1323,7 @@ 
 	/**

 	 * Returns a formatted mail line.

 	 * @access public

+	 * @param string $value
 	 * @return string

 	 */

 	public function TextLine($value) {

@@ -1521,6 +1527,7 @@ 
 	/**

 	 * Encode a header string to best (shortest) of Q, B, quoted or none.

 	 * @access public

+	 * @param string $str
 	 * @return string

 	 */

 	public function EncodeHeader($str, $position = 'text') {

@@ -1635,7 +1642,6 @@ 
 	 * 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

 	 */

@@ -1904,6 +1910,7 @@ 
 	/**

 	 * Adds the error message to the error container.

 	 * @access protected

+	 * @param string $msg
 	 * @return void

 	 */

 	protected function SetError($msg) {

@@ -1953,6 +1960,7 @@ 
 	/**

 	 * Returns a message in the appropriate language.

 	 * @access private

+	 * @param string $key
 	 * @return string

 	 */

 	private function Lang($key) {

@@ -1979,6 +1987,7 @@ 
 	/**

 	 * Changes every end of line from CR or LF to CRLF.

 	 * @access private

+	 * @param string $str
 	 * @return string

 	 */

 	private function FixEOL($str) {

@@ -2194,8 +2203,6 @@ 
 	 * 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 = "";

@@ -2310,6 +2317,11 @@ 
 		return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n" . $dkimhdrs . $signed . "\r\n";

 	}

 

+	/**
+	 * @param integer $isSent
+	 * @param string $subject
+	 * @param string $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);

Spacing +8 added lines, -9 removed lines

@@ -945,7 +945,7 @@ 
 			$buf = '';

 			for ($e = 0; $e < count($line_part); $e++) {

 				$word = $line_part[$e];

-				if ($qp_mode and ( strlen($word) > $length)) {

+				if ($qp_mode and (strlen($word) > $length)) {

 					$space_left = $length - strlen($buf) - 1;

 					if ($e != 0) {

 						if ($space_left > 20) {

@@ -1023,8 +1023,7 @@ 
 				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 :

-							$maxLength - ($lookBack - $encodedCharPos);

+					$maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);

 					$foundSplitPos = true;

 				} elseif ($dec >= 192) { // First byte of a multi byte character

 					// Reduce maxLength to split at start of character

@@ -1651,16 +1650,16 @@ 
 			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

+				if (($i == 0) && ($dec == 46)) { // convert first point in the line into =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) {

 						$c = '=20';

 					}

-				} elseif (($dec == 61) || ($dec < 32 ) || ($dec > 126)) { // always encode "\t", which is *not* required

+				} 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];

@@ -1908,7 +1907,7 @@ 
 	 */

 	protected function SetError($msg) {

 		$this->error_count++;

-		if ($this->Mailer == 'smtp' and ! is_null($this->smtp)) {

+		if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {

 			$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";

@@ -2203,9 +2202,9 @@ 
 		for ($i = 0; $i < strlen($txt); $i++) {

 			$ord = ord($txt[$i]);

 			if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {

-				$line.=$txt[$i];

+				$line .= $txt[$i];

 			} else {

-				$line.="=" . sprintf("%02X", $ord);

+				$line .= "=" . sprintf("%02X", $ord);

 			}

 		}

 		return $line;

Braces +9 added lines, -6 removed lines

@@ -38,8 +38,9 @@ 
  * @version $Id: class.phpmailer.php 447 2009-05-25 01:36:38Z codeworxtech $

  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License

  */

-if (version_compare(PHP_VERSION, '5.0.0', '<'))

-	exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");

+if (version_compare(PHP_VERSION, '5.0.0', '<')) {
+	exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+}
 

 class PHPMailer {

 	/////////////////////////////////////////////////

@@ -1502,8 +1503,9 @@ 
 			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;

+				if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+									$encoded .= $this->LE;
+				}
 				break;

 			case 'binary':

 				$encoded = $str;

@@ -2255,8 +2257,9 @@ 
 	 * @param string $body Message Body

 	 */

 	public function DKIM_BodyC($body) {

-		if ($body == '')

-			return "\r\n";

+		if ($body == '') {
+					return "\r\n";
+		}
 		// stabilize line endings

 		$body = str_replace("\r\n", "\n", $body);

 		$body = str_replace("\n", "\r\n", $body);

lib/vendor/phpmailer/class.smtp.php

Doc Comments +4 added lines

@@ -318,6 +318,7 @@ 
 	 * SMTP CODE FAILURE: 451,554

 	 * SMTP CODE ERROR : 500,501,503,421

 	 * @access public

+	 * @param string $msg_data
 	 * @return bool

 	 */

 	public function Data($msg_data) {

@@ -482,6 +483,8 @@ 
 	/**

 	 * Sends a HELO/EHLO command.

 	 * @access private

+	 * @param string $hello
+	 * @param string $host
 	 * @return bool

 	 */

 	private function SendHello($hello, $host) {

@@ -521,6 +524,7 @@ 
 	 * SMTP CODE SUCCESS: 552,451,452

 	 * SMTP CODE SUCCESS: 500,501,421

 	 * @access public

+	 * @param string $from
 	 * @return bool

 	 */

 	public function Mail($from) {

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 	 * Sets whether debugging is turned on

 	 * @var bool

 	 */

-	public $do_debug;	// the level of debug to perform

+	public $do_debug; // the level of debug to perform

 

 	/**

 	 * Sets VERP use on/off (default is off)

@@ -76,7 +76,7 @@ 
 	/////////////////////////////////////////////////

 

 	private $smtp_conn; // the socket to the server

-	private $error;	 // error if any on the last call

+	private $error; // error if any on the last call

 	private $helo_rply; // the reply the server sent to us for HELO

 

 	/**

Braces +3 added lines, -2 removed lines

@@ -144,8 +144,9 @@
 

 		// 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);

+		if (substr(PHP_OS, 0, 3) != "WIN") {
+					socket_set_timeout($this->smtp_conn, $tval, 0);
+		}
 

 		// get any announcement

 		$announce = $this->get_lines();