chamilo / chamilo-lms

main/inc/lib/pear/Pager/Sliding.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
      *
      * @param integer $pageid PageID to get offsets for
      *
-     * @return array  First and last offsets
+     * @return integer[]  First and last offsets
      * @access public
      */
     function getPageRangeByPageId($pageid = null)

Indentation +5 added lines, -5 removed lines

@@ -234,8 +234,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                           . $this->_spacesBefore
-                           . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                            . $this->_spacesBefore
+                            . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -268,8 +268,8 @@ 
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i)
-                      . $this->_spacesBefore
-                      . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
+                        . $this->_spacesBefore
+                        . ($print_separator_flag ? $this->_separator.$this->_spacesAfter : '');
                 }
             }
 
@@ -285,7 +285,7 @@ 
                     $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
                 }
                 $links .= $this->_spacesBefore
-                       . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
+                        . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');
             }
         }
         return $links;

Spacing +7 added lines, -7 removed lines

@@ -112,7 +112,7 @@ 
      */
     function getPageRangeByPageId($pageid = null)
     {
-        $pageid = isset($pageid) ? (int)$pageid : $this->_currentPage;
+        $pageid = isset($pageid) ? (int) $pageid : $this->_currentPage;
         if (!isset($this->_pageData)) {
             $this->_generatePageData();
         }
@@ -146,7 +146,7 @@ 
      * @return array back/pages/next/first/last/all links
      * @access public
      */
-    function getLinks($pageID = null, $dummy='')
+    function getLinks($pageID = null, $dummy = '')
     {
         if (!is_null($pageID)) {
             $_sav = $this->_currentPage;
@@ -251,7 +251,7 @@ 
 
                 if ($i == $this->_currentPage) {
                     $this->range[$i] = true;
-                    $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
+                    $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost;
                 } else {
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
@@ -262,8 +262,8 @@ 
             }
 
             if ($this->_expanded && $expansion_after) {
-                $links .= $this->_separator . $this->_spacesAfter;
-                for ($i = $this->_currentPage + $this->_delta +1; $expansion_after; $expansion_after--, $i++) {
+                $links .= $this->_separator.$this->_spacesAfter;
+                for ($i = $this->_currentPage + $this->_delta + 1; $expansion_after; $expansion_after--, $i++) {
                     $print_separator_flag = ($expansion_after != 1);
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
@@ -275,14 +275,14 @@ 
 
         } else {
             //if $this->_totalPages <= (2*Delta+1) show them all
-            for ($i=1; $i<=$this->_totalPages; $i++) {
+            for ($i = 1; $i <= $this->_totalPages; $i++) {
                 if ($i != $this->_currentPage) {
                     $this->range[$i] = false;
                     $this->_linkData[$this->_urlVar] = $i;
                     $links .= $this->_renderLink(str_replace('%d', $i, $this->_altPage), $i);
                 } else {
                     $this->range[$i] = true;
-                    $links .= $this->_curPageSpanPre . $i . $this->_curPageSpanPost;
+                    $links .= $this->_curPageSpanPre.$i.$this->_curPageSpanPost;
                 }
                 $links .= $this->_spacesBefore
                        . (($i != $this->_totalPages) ? $this->_separator.$this->_spacesAfter : '');

main/inc/lib/pear/Text/Diff/Engine/native.php

Doc Comments +5 added lines

@@ -147,6 +147,7 @@ 
      * the two files do not match, and likewise that the last lines do not
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
+     * @param double $nchunks
      */
     function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
@@ -267,6 +268,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
     function _compareseq ($xoff, $xlim, $yoff, $ylim)
     {

Spacing +8 added lines, -8 removed lines

@@ -148,7 +148,7 @@ 
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -171,7 +171,7 @@ 
         }
 
         $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
+        $this->seq[0] = $yoff - 1;
         $this->in_seq = array();
         $ymids[0] = array();
 
@@ -184,7 +184,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
                 if (empty($ymatches[$line])) {
@@ -220,7 +220,7 @@ 
         $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
         $ymid = $ymids[$this->lcs];
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
             $y1 = $ymid[$n] + 1;
             $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
         }
@@ -240,7 +240,7 @@ 
 
         $beg = 1;
         while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
+            $mid = (int) (($beg + $end) / 2);
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;
             } else {
@@ -268,7 +268,7 @@ 
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
      */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
+    function _compareseq($xoff, $xlim, $yoff, $ylim)
     {
         /* Slide down the bottom initial diagonal. */
         while ($xoff < $xlim && $yoff < $ylim
@@ -309,7 +309,7 @@ 
             reset($seps);
             $pt1 = $seps[0];
             while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
                 $pt1 = $pt2;
             }
         }
@@ -352,7 +352,7 @@ 
                 $j++;
             }
 
-            while ($i < $len && ! $changed[$i]) {
+            while ($i < $len && !$changed[$i]) {
                 assert('$j < $other_len && ! $other_changed[$j]');
                 $i++; $j++;
                 while ($j < $other_len && $other_changed[$j]) {

main/inc/lib/pear/Text/Diff/Renderer.php

Doc Comments +9 added lines

@@ -143,6 +143,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -199,6 +205,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     function _startBlock($header)
     {
         return $header . "\n";

Indentation +4 added lines, -4 removed lines

@@ -104,8 +104,8 @@ 
                         }
                         /* @todo */
                         $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
+                                                    $y0, $ntrail + $yi - $y0,
+                                                    $block);
                         $block = false;
                     }
                 }
@@ -136,8 +136,8 @@ 
 
         if (is_array($block)) {
             $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
+                                        $y0, $yi - $y0,
+                                        $block);
         }
 
         return $output . $this->_endDiff();

Switch Indentation +12 added lines, -12 removed lines

@@ -149,21 +149,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+                case 'text_diff_op_copy':
+                    $output .= $this->_context($edit->orig);
+                    break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+                case 'text_diff_op_add':
+                    $output .= $this->_added($edit->final);
+                    break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+                case 'text_diff_op_delete':
+                    $output .= $this->_deleted($edit->orig);
+                    break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+                case 'text_diff_op_change':
+                    $output .= $this->_changed($edit->orig, $edit->final);
+                    break;
             }
         }
 

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
     function Text_Diff_Renderer($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -140,7 +140,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -167,7 +167,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     function _startDiff()
@@ -183,10 +183,10 @@ 
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
         // this matches the GNU Diff behaviour
@@ -196,12 +196,12 @@ 
             $xbeg--;
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     function _endBlock()
@@ -211,7 +211,7 @@ 
 
     function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     function _context($lines)
@@ -231,7 +231,7 @@ 
 
     function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 
 }

main/inc/lib/pear/Text/Diff/Renderer/inline.php

Doc Comments +6 added lines

@@ -74,6 +74,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -141,6 +144,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     function _splitOnWords($string, $newlineEscape = "\n")
     {
         // Ignore \0; otherwise the while loop will never finish.

Indentation +2 added lines, -2 removed lines

@@ -129,13 +129,13 @@
          * preserve whitespace as well. Therefore we split on words,
          * but include all blocks of whitespace in the wordlist. */
         $diff = new Text_Diff('native',
-                              array($this->_splitOnWords($text1, $nl),
+                                array($this->_splitOnWords($text1, $nl),
                                     $this->_splitOnWords($text2, $nl)));
 
         /* Get the diff in inline format. */
         $renderer = new Text_Diff_Renderer_inline
             (array_merge($this->getParams(),
-                         array('split_level' => 'words')));
+                            array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";

Spacing +6 added lines, -7 removed lines

@@ -83,14 +83,14 @@ 
         if ($this->_split_level == 'words') {
             return implode('', $lines);
         } else {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         }
     }
 
     function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -98,7 +98,7 @@ 
     function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -116,7 +116,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -133,12 +133,11 @@ 
                                     $this->_splitOnWords($text2, $nl)));
 
         /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
+        $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
                          array('split_level' => 'words')));
 
         /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     function _splitOnWords($string, $newlineEscape = "\n")

main/inc/lib/pear/Text/Password.php

Doc Comments +10 added lines

@@ -180,6 +180,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _xor($login, $key)
@@ -208,6 +209,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotx($login, $key)
@@ -241,6 +243,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxpp($login, $key)
@@ -274,6 +277,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _rotxmm($login, $key)
@@ -306,6 +310,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotx($login, $key)
@@ -340,6 +345,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxpp($login, $key)
@@ -374,6 +380,7 @@ 
      * @access private
      * @param  string  Login
      * @param  integer Key
+     * @param integer $key
      * @return string
      */
     function _asciiRotxmm($login, $key)
@@ -430,6 +437,7 @@ 
      *
      * @access private
      * @param  integer Length of the password
+     * @param integer $length
      * @return string  Returns the password
      */
     function _createPronounceable($length)
@@ -475,6 +483,8 @@ 
      * @param  string  Character which could be use in the
      *                 unpronounceable password ex : 'ABCDEFG'
      *                 or numeric, alphabetical or alphanumeric.
+     * @param integer $length
+     * @param string $chars
      * @return string  Returns the password
      */
     function _createUnpronounceable($length, $chars)

Indentation +37 added lines, -37 removed lines

@@ -441,17 +441,17 @@ 
          * List of vowels and vowel sounds
          */
         $v = array('a', 'e', 'i', 'o', 'u', 'ae', 'ou', 'io',
-                   'ea', 'ou', 'ia', 'ai'
-                   );
+                    'ea', 'ou', 'ia', 'ai'
+                    );
 
         /**
          * List of consonants and consonant sounds
          */
         $c = array('b', 'c', 'd', 'g', 'h', 'j', 'k', 'l', 'm',
-                   'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
-                   'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
-                   'ch', 'ph', 'st', 'sl', 'cl'
-                   );
+                    'n', 'p', 'r', 's', 't', 'u', 'v', 'w',
+                    'tr', 'cr', 'fr', 'dr', 'wr', 'pr', 'th',
+                    'ch', 'ph', 'st', 'sl', 'cl'
+                    );
 
         $v_count = 12;
         $c_count = 29;
@@ -484,50 +484,50 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+            switch($chars) {
 
-         case 'alphanumeric':
+            case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                break;
 
-         case 'alphabetical':
+            case 'alphabetical':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                break;
 
-         case 'numeric':
+            case 'numeric':
              $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                break;
 
-         case '':
+            case '':
              $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                break;
 
-         default:
+            default:
              /**
               * Some characters shouldn't be used
               */
              $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
-
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
-         }
-
-         /**
-          * Generate password
-          */
-         for ($i = 0; $i < $length; $i++) {
-             $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
-             $password .= $chars{$num};
-         }
-
-         /**
-          * Return password
-          */
-         return $password;
+                $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+
+                $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+            }
+
+            /**
+             * Generate password
+             */
+            for ($i = 0; $i < $length; $i++) {
+                $num = mt_rand(0, $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] - 1);
+                $password .= $chars{$num};
+            }
+
+            /**
+             * Return password
+             */
+            return $password;
     }
 }
 ?>

Switch Indentation +61 added lines, -61 removed lines

@@ -55,12 +55,12 @@ 
     function create($length = 10, $type = 'pronounceable', $chars = '')
     {
         switch ($type) {
-        case 'unpronounceable' :
-            return Text_Password::_createUnpronounceable($length, $chars);
+            case 'unpronounceable' :
+                return Text_Password::_createUnpronounceable($length, $chars);
 
-        case 'pronounceable' :
-        default :
-            return Text_Password::_createPronounceable($length);
+            case 'pronounceable' :
+            default :
+                return Text_Password::_createPronounceable($length);
         }
     }
 
@@ -110,35 +110,35 @@ 
     function createFromLogin($login, $type, $key = 0)
     {
         switch ($type) {
-        case 'reverse':
-            return strrev($login);
+            case 'reverse':
+                return strrev($login);
 
-        case 'shuffle':
-            return Text_Password::_shuffle($login);
+            case 'shuffle':
+                return Text_Password::_shuffle($login);
 
-        case 'xor':
-            return Text_Password::_xor($login, $key);
+            case 'xor':
+                return Text_Password::_xor($login, $key);
 
-        case 'rot13':
-            return str_rot13($login);
+            case 'rot13':
+                return str_rot13($login);
 
-        case 'rotx':
-            return Text_Password::_rotx($login, $key);
+            case 'rotx':
+                return Text_Password::_rotx($login, $key);
 
-        case 'rotx++':
-            return Text_Password::_rotxpp($login, $key);
+            case 'rotx++':
+                return Text_Password::_rotxpp($login, $key);
 
-        case 'rotx--':
-            return Text_Password::_rotxmm($login, $key);
+            case 'rotx--':
+                return Text_Password::_rotxmm($login, $key);
 
-        case 'ascii_rotx':
-            return Text_Password::_asciiRotx($login, $key);
+            case 'ascii_rotx':
+                return Text_Password::_asciiRotx($login, $key);
 
-        case 'ascii_rotx++':
-            return Text_Password::_asciiRotxpp($login, $key);
+            case 'ascii_rotx++':
+                return Text_Password::_asciiRotxpp($login, $key);
 
-        case 'ascii_rotx--':
-            return Text_Password::_asciiRotxmm($login, $key);
+            case 'ascii_rotx--':
+                return Text_Password::_asciiRotxmm($login, $key);
         }
     }
 
@@ -320,11 +320,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -354,11 +354,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -388,11 +388,11 @@ 
                 $next += 255;
             }
             switch ($next) { // delete white space
-            case 0x09:
-            case 0x20:
-            case 0x0A:
-            case 0x0D:
-                $next++;
+                case 0x09:
+                case 0x20:
+                case 0x0A:
+                case 0x0D:
+                    $next++;
             }
             $tmp .= chr($next);
         }
@@ -486,34 +486,34 @@ 
          */
          switch($chars) {
 
-         case 'alphanumeric':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
-             break;
+             case 'alphanumeric':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 62;
+                 break;
 
-         case 'alphabetical':
-             $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
-             break;
+             case 'alphabetical':
+                 $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 52;
+                 break;
 
-         case 'numeric':
-             $chars = '0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
-             break;
+             case 'numeric':
+                 $chars = '0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 10;
+                 break;
 
-         case '':
-             $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
-             break;
+             case '':
+                 $chars = '_#@%&ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = 67;
+                 break;
 
-         default:
-             /**
+             default:
+                 /**
               * Some characters shouldn't be used
               */
-             $chars = trim($chars);
-             $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
+                 $chars = trim($chars);
+                 $chars = str_replace(array('+', '|', '$', '^', '/', '\\', ','), '', $chars);
 
-             $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
+                 $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = strlen($chars);
          }
 
          /**

Spacing +2 added lines, -2 removed lines

@@ -459,7 +459,7 @@ 
         $GLOBALS['_Text_Password_NumberOfPossibleCharacters'] = $v_count + $c_count;
 
         for ($i = 0; $i < $length; $i++) {
-            $retVal .= $c[mt_rand(0, $c_count-1)] . $v[mt_rand(0, $v_count-1)];
+            $retVal .= $c[mt_rand(0, $c_count - 1)].$v[mt_rand(0, $v_count - 1)];
         }
 
         return substr($retVal, 0, $length);
@@ -484,7 +484,7 @@ 
         /**
          * List of character which could be use in the password
          */
-         switch($chars) {
+         switch ($chars) {
 
          case 'alphanumeric':
              $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';

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

Doc Comments +15 added lines, -3 removed lines

@@ -891,6 +891,7 @@ 
   /**
    * Creates recipient headers.
    * @access public
+   * @param string $type
    * @return string
    */
   public function AddrAppend($type, $addr) {
@@ -1258,6 +1259,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 = '';
@@ -1311,6 +1315,7 @@ 
   /**
    *  Returns a formatted header line.
    * @access public
+   * @param string $name
    * @return string
    */
   public function HeaderLine($name, $value) {
@@ -1320,6 +1325,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') {
@@ -1647,7 +1654,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
   */
@@ -1917,6 +1923,7 @@ 
   /**
    * Adds the error message to the error container.
    * @access protected
+   * @param string $msg
    * @return void
    */
   protected function SetError($msg) {
@@ -1966,6 +1973,7 @@ 
   /**
    * Returns a message in the appropriate language.
    * @access private
+   * @param string $key
    * @return string
    */
   private function Lang($key) {
@@ -1992,6 +2000,7 @@ 
   /**
    * Changes every end of line from CR or LF to CRLF.
    * @access private
+   * @param string $str
    * @return string
    */
   private function FixEOL($str) {
@@ -2203,8 +2212,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="";
@@ -2318,6 +2325,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);

Indentation +1454 added lines, -1454 removed lines

@@ -42,441 +42,441 @@ 
 
 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 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_identity   = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @var string
-   */
-  public $DKIM_domain     = '';
-
-  /**
-   * Used with DKIM DNS Resource Record
-   * optional, in format of email address 'you@yourdomain.com'
-   * @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 'you@yourdomain.com'
+     * @var string
+     */
+    public $DKIM_identity   = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address 'you@yourdomain.com'
+     * @var string
+     */
+    public $DKIM_domain     = '';
+
+    /**
+     * Used with DKIM DNS Resource Record
+     * optional, in format of email address 'you@yourdomain.com'
+     * @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 @@ 
  * @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 @@ 
         $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 @@ 
 
     // 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 @@ 
 
         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 @@ 
 
     $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 @@ 
 
     $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 @@ 
 
     // 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 @@ 
         $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 @@ 
     }
 
     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 @@ 
     $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 @@ 
         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 @@ 
 
     // 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 @@ 
         }
         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 @@ 
 
     }
 
-  /**
-   * 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 @@ 
     $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 @@ 
         //
         $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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;
-  }
+    }
 }
 ?>

Spacing +235 added lines, -236 removed lines

@@ -38,7 +38,7 @@ 
  * @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 {
 
@@ -50,64 +50,64 @@ 
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  public $Priority          = 3;
+  public $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  public $CharSet           = 'iso-8859-1';
+  public $CharSet = 'iso-8859-1';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  public $ContentType       = 'text/plain';
+  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';
+  public $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  public $ErrorInfo         = '';
+  public $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  public $From              = 'root@localhost';
+  public $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  public $FromName          = 'Root User';
+  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            = '';
+  public $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  public $Subject           = '';
+  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              = '';
+  public $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -116,39 +116,39 @@ 
    * that can read HTML will view the normal Body.
    * @var string
    */
-  public $AltBody           = '';
+  public $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  public $WordWrap          = 0;
+  public $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  public $Mailer            = 'mail';
+  public $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  public $Sendmail          = '/usr/sbin/sendmail';
+  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         = '';
+  public $PluginDir = '';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  public $ConfirmReadingTo  = '';
+  public $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -156,14 +156,14 @@ 
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  public $Hostname          = '';
+  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         = '';
+  public $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -177,57 +177,57 @@ 
    * Hosts will be tried in order.
    * @var string
    */
-  public $Host          = 'localhost';
+  public $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  public $Port          = 25;
+  public $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  public $Helo          = '';
+  public $Helo = '';
 
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
    * @var string
    */
-  public $SMTPSecure    = '';
+  public $SMTPSecure = '';
 
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  public $SMTPAuth      = false;
+  public $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  public $Username      = '';
+  public $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  public $Password      = '';
+  public $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
    */
-  public $Timeout       = 10;
+  public $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  public $SMTPDebug     = false;
+  public $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -242,7 +242,7 @@ 
    * emails, instead of sending to entire TO addresses
    * @var bool
    */
-  public $SingleTo      = false;
+  public $SingleTo = false;
 
    /**
    * If SingleTo is true, this provides the array to hold the email addresses
@@ -254,34 +254,34 @@ 
    * Provides the ability to change the line ending
    * @var string
    */
-  public $LE              = "\n";
+  public $LE = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
-  public $DKIM_selector   = 'phpmailer';
+  public $DKIM_selector = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_identity   = '';
+  public $DKIM_identity = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_domain     = '';
+  public $DKIM_domain = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_private    = '';
+  public $DKIM_private = '';
 
   /**
    * Callback Action function name
@@ -300,7 +300,7 @@ 
    * Sets the PHPMailer Version number
    * @var string
    */
-  public $Version         = '5.1';
+  public $Version = '5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
@@ -451,13 +451,13 @@ 
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      error_log('Invalid recipient array: ' . $kind);
+      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);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -485,11 +485,11 @@ 
  * @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);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -522,7 +522,7 @@ 
    */
   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 {
         return true;
@@ -549,7 +549,7 @@ 
       }
 
       // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+      if (!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
       }
 
@@ -564,12 +564,12 @@ 
 
       // 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;
+        $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) {
+      switch ($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($header, $body);
         case 'smtp':
@@ -602,32 +602,32 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        if (!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
-        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, "To: ".$val."\n");
         fputs($mail, $header);
         fputs($mail, $body);
         $result = pclose($mail);
         // implement call back function if it exists
         $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);
+        $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);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      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) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      $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;
@@ -642,13 +642,13 @@ 
    */
   protected function MailSend($header, $body) {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+    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) {
@@ -656,13 +656,13 @@ 
           $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);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } 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);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -670,19 +670,19 @@ 
           $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);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } 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);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
@@ -698,64 +698,64 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'class.smtp.php';
+    require_once $this->PluginDir.'class.smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       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);
+    if (!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       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);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       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);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       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);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       }
     }
 
 
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+    if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+      throw new phpmailerException($this->Lang('recipients_failed').$badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     }
     return true;
@@ -769,7 +769,7 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP();
     }
 
@@ -780,7 +780,7 @@ 
 
     // 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];
@@ -793,7 +793,7 @@ 
         $tls = ($this->SMTPSecure == 'tls');
         $ssl = ($this->SMTPSecure == 'ssl');
 
-        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+        if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) {
 
           $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
           $this->smtp->Hello($hello);
@@ -831,8 +831,8 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+    if (!is_null($this->smtp)) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -894,7 +894,7 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
@@ -914,7 +914,7 @@ 
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
   }
 
@@ -941,10 +941,10 @@ 
 
     $line = explode($this->LE, $message);
     $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
+    for ($i = 0; $i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+      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;
@@ -960,10 +960,10 @@ 
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+              $buf .= ' '.$part;
+              $message .= $buf.sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+              $message .= $buf.$soft_break;
             }
             $buf = '';
           }
@@ -980,22 +980,22 @@ 
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+              $message .= $part.sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+          $buf .= ($e == 0) ? $word : (' '.$word);
 
           if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
+            $message .= $buf_o.$soft_break;
             $buf = $word;
           }
         }
       }
-      $message .= $buf . $this->LE;
+      $message .= $buf.$this->LE;
     }
 
     return $message;
@@ -1024,8 +1024,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
@@ -1049,11 +1048,11 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
@@ -1074,24 +1073,24 @@ 
 
     // Set the boundaries
     $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
+    $this->boundary[1] = 'b1_'.$uniq_id;
+    $this->boundary[2] = 'b2_'.$uniq_id;
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
+    if ($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-        if(count($this->to) > 0) {
+        if (count($this->to) > 0) {
           $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
           $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1105,38 +1104,38 @@ 
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (count($this->cc) > 0) {
       $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)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    if ($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $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) . '>');
+    if ($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -1154,27 +1153,27 @@ 
    */
   public function GetMailMIME() {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       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 'alt_attachments':
-        if($this->InlineImageExists()){
+        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);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+          $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
@@ -1195,7 +1194,7 @@ 
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -1216,11 +1215,11 @@ 
         break;
       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
+        $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
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
@@ -1261,16 +1260,16 @@ 
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
-    $result .= $this->TextLine('--' . $boundary);
+    $result .= $this->TextLine('--'.$boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
@@ -1284,7 +1283,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1293,16 +1292,16 @@ 
    * @return void
    */
   private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+    if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $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';
       }
     }
@@ -1314,7 +1313,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1323,7 +1322,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1342,11 +1341,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-      if ( !@is_file($path) ) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+      if (!@is_file($path)) {
+        throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE);
       }
       $filename = basename($path);
-      if ( $name == '' ) {
+      if ($name == '') {
         $name = $filename;
       }
 
@@ -1356,7 +1355,7 @@ 
         2 => $name,
         3 => $encoding,
         4 => $type,
-        5 => false,  // isStringAttachment
+        5 => false, // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
@@ -1367,7 +1366,7 @@ 
         throw $e;
       }
       error_log($e->getMessage()."\n");
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1412,29 +1411,29 @@ 
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      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 ($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);
 
       // Encode as string attachment
-      if($bString) {
+      if ($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
@@ -1458,7 +1457,7 @@ 
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+        throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE);
       }
         $magic_quotes = get_magic_quotes_runtime();
         if ($magic_quotes) {
@@ -1492,9 +1491,9 @@ 
    * @access public
    * @return string
    */
-  public function EncodeString ($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1512,7 +1511,7 @@ 
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1554,7 +1553,7 @@ 
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
+    if (strlen($str) / 3 < $x) {
       $encoding = 'B';
       // Modified by Ivan Tcholakov, 24-JAN-2010.
       //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
@@ -1635,7 +1634,7 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1651,37 +1650,37 @@ 
   * @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');
+  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) ) {
+    while (list(, $line) = each($lines)) {
       $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
+      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';
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+        if ($dec == 32) {
+          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);
+        } 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];
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+        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 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -1733,7 +1732,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeQ ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
@@ -1776,7 +1775,7 @@ 
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
-      5 => true,  // isStringAttachment
+      5 => true, // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
@@ -1797,13 +1796,13 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if ( $name == '' ) {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1814,7 +1813,7 @@ 
       2 => $name,
       3 => $encoding,
       4 => $type,
-      5 => false,  // isStringAttachment
+      5 => false, // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
@@ -1828,7 +1827,7 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
@@ -1845,7 +1844,7 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -1856,7 +1855,7 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -1867,7 +1866,7 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -1924,7 +1923,7 @@ 
     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";
+        $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n";
       }
     }
     $this->ErrorInfo = $msg;
@@ -1940,7 +1939,7 @@ 
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -1969,14 +1968,14 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+      return 'Language string failed to load: '.$key;
     }
   }
 
@@ -2017,19 +2016,19 @@ 
    */
   public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
+        if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($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) ) {
+          $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);
           }
         }
@@ -2037,12 +2036,12 @@ 
     }
     $this->IsHTML(true);
     $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$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);
     }
     if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n";
     }
   }
 
@@ -2160,10 +2159,10 @@ 
   */
   public function set($name, $value = '') {
     try {
-      if (isset($this->$name) ) {
+      if (isset($this->$name)) {
         $this->$name = $value;
       } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL);
       }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
@@ -2207,14 +2206,14 @@ 
    * @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)) ) {
-        $line.=$txt[$i];
+    $tmp = "";
+    $line = "";
+    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];
       } else {
-        $line.="=".sprintf("%02X",$ord);
+        $line .= "=".sprintf("%02X", $ord);
       }
     }
     return $line;
@@ -2228,8 +2227,8 @@ 
    */
   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);
+    if ($this->DKIM_passphrase != '') {
+      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
@@ -2245,15 +2244,15 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$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);
+    $s = implode("\r\n", $lines);
     return $s;
   }
 
@@ -2266,11 +2265,11 @@ 
   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);
+    $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);
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+      $body = substr($body, 0, strlen($body) - 2);
     }
     return $body;
   }
@@ -2283,52 +2282,52 @@ 
    * @param string $subject Subject
    * @param string $body Body
    */
-  public function DKIM_Add($headers_line,$subject,$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
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $DKIMtime             = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
+    $headers              = explode("\r\n", $headers_line);
+    foreach ($headers as $header) {
+      if (strpos($header, 'From:') === 0) {
+        $from_header = $header;
+      } 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));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+    $DKIMlen  = strlen($body); // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n".
+                "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n".
                 "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\td=".$this->DKIM_domain.";".$ident."\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tbh=".$DKIMb64.";\r\n".
                 "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $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() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
     return $errorMsg;
   }
 }

Braces +9 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
  * @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 +1504,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;
@@ -2264,7 +2267,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);

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

Doc Comments +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
    * @param string $host
    * @param integer $port
    * @param integer $tval
-   * @return boolean
+   * @return boolean|null
    */
   public function Connect ($host, $port = false, $tval = 30) {
     //  Are we already connected?

Indentation +203 added lines, -203 removed lines

@@ -60,103 +60,103 @@ 
  */
 
 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 @@ 
     $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 @@ 
     $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 @@ 
 
     //  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 @@ 
     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 @@ 
     $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

Spacing +17 added lines, -17 removed lines

@@ -120,7 +120,7 @@ 
 
   private $pop_conn;
   private $connected;
-  private $error;     //  Error log array
+  private $error; //  Error log array
 
   /**
    * Constructor, sets the initial values
@@ -142,7 +142,7 @@ 
    * @param string $username
    * @param string $password
    */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
+  public function Authorise($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
     $this->host = $host;
 
     //  If no port value is passed, retrieve it
@@ -194,7 +194,7 @@ 
    * @param integer $tval
    * @return boolean
    */
-  public function Connect ($host, $port = false, $tval = 30) {
+  public function Connect($host, $port = false, $tval = 30) {
     //  Are we already connected?
     if ($this->connected) {
       return true;
@@ -208,11 +208,11 @@ 
     set_error_handler(array(&$this, 'catchWarning'));
 
     //  Connect to the POP3 server
-    $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
+    $this->pop_conn = fsockopen($host, //  POP3 Host
+                  $port, //  Port #
+                  $errno, //  Error Number
+                  $errstr, //  Error Message
+                  $tval); //  Timeout (seconds)
 
     //  Restore the error handler
     restore_error_handler();
@@ -269,7 +269,7 @@ 
    * @param string $password
    * @return boolean
    */
-  public function Login ($username = '', $password = '') {
+  public function Login($username = '', $password = '') {
     if ($this->connected == false) {
       $this->error = 'Not connected to POP3 server';
 
@@ -286,8 +286,8 @@ 
       $password = $this->password;
     }
 
-    $pop_username = "USER $username" . $this->CRLF;
-    $pop_password = "PASS $password" . $this->CRLF;
+    $pop_username = "USER $username".$this->CRLF;
+    $pop_password = "PASS $password".$this->CRLF;
 
     //  Send the Username
     $this->sendString($pop_username);
@@ -312,7 +312,7 @@ 
    * Disconnect from the POP3 server
    * @access public
    */
-  public function Disconnect () {
+  public function Disconnect() {
     $this->sendString('QUIT');
 
     fclose($this->pop_conn);
@@ -329,7 +329,7 @@ 
    * @param integer $size
    * @return string
    */
-  private function getResponse ($size = 128) {
+  private function getResponse($size = 128) {
     $pop3_response = fgets($this->pop_conn, $size);
 
     return $pop3_response;
@@ -341,7 +341,7 @@ 
    * @param string $string
    * @return integer
    */
-  private function sendString ($string) {
+  private function sendString($string) {
     $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
 
     return $bytes_sent;
@@ -353,7 +353,7 @@ 
    * @param string $string
    * @return boolean
    */
-  private function checkResponse ($string) {
+  private function checkResponse($string) {
     if (substr($string, 0, 3) !== '+OK') {
       $this->error = array(
         'error' => "Server reported an error: $string",
@@ -376,7 +376,7 @@ 
    * If debug is enabled, display the error message array
    * @access private
    */
-  private function displayErrors () {
+  private function displayErrors() {
     echo '<pre>';
 
     foreach ($this->error as $single_error) {
@@ -394,7 +394,7 @@ 
    * @param string $errfile
    * @param integer $errline
    */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
+  private function catchWarning($errno, $errstr, $errfile, $errline) {
     $this->error[] = array(
       'error' => "Connecting to the POP3 server raised a PHP warning: ",
       'errno' => $errno,

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

Doc Comments +4 added lines

@@ -321,6 +321,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) {

@@ -488,6 +489,8 @@ 
   /**

    * Sends a HELO/EHLO command.

    * @access private

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

    */

   private function SendHello($hello, $host) {

@@ -528,6 +531,7 @@ 
    * SMTP CODE SUCCESS: 552,451,452

    * SMTP CODE SUCCESS: 500,501,421

    * @access public

+   * @param string $from
    * @return bool

    */

   public function Mail($from) {

Indentation +429 added lines, -429 removed lines

@@ -47,130 +47,130 @@ 
  */

 

 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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
     $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 @@ 
 

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

-  }

+    }

 

 }

 

Spacing +154 added lines, -154 removed lines

@@ -63,7 +63,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

 

   /**

@@ -114,43 +114,43 @@ 
     $this->error = null;

 

     // make sure we are __not__ connected

-    if($this->connected()) {

+    if ($this->connected()) {

       // already connected, generate error

       $this->error = array("error" => "Already connected to a server");

       return false;

     }

 

-    if(empty($port)) {

+    if (empty($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

+    $this->smtp_conn = @fsockopen($host, // the host of the server

+                                 $port, // the port to use

+                                 $errno, // error number if any

+                                 $errstr, // error message if any

+                                 $tval); // give up after ? secs

     // verify we connected properly

-    if(empty($this->smtp_conn)) {

+    if (empty($this->smtp_conn)) {

       $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 />';

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": $errstr ($errno)".$this->CRLF.'<br />';

       }

       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")

+    if (substr(PHP_OS, 0, 3) != "WIN")

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

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$announce.$this->CRLF.'<br />';

     }

 

     return true;

@@ -168,33 +168,33 @@ 
   public function StartTLS() {

     $this->error = null; # to avoid confusion

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array("error" => "Called StartTLS() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);

+    fputs($this->smtp_conn, "STARTTLS".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 220) {

+    if ($code != 220) {

       $this->error =

          array("error"     => "STARTTLS not accepted from server",

                "smtp_code" => $code,

-               "smtp_msg"  => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+               "smtp_msg"  => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Begin encrypted connection

-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

+    if (!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {

       return false;

     }

 

@@ -209,52 +209,52 @@ 
    */

   public function Authenticate($username, $password) {

     // Start authentication

-    fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);

+    fputs($this->smtp_conn, "AUTH LOGIN".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 334) {

+    if ($code != 334) {

       $this->error =

         array("error" => "AUTH 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Send encoded username

-    fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);

+    fputs($this->smtp_conn, base64_encode($username).$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 334) {

+    if ($code != 334) {

       $this->error =

         array("error" => "Username 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

 

     // Send encoded password

-    fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);

+    fputs($this->smtp_conn, base64_encode($password).$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($code != 235) {

+    if ($code != 235) {

       $this->error =

         array("error" => "Password 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -268,12 +268,12 @@ 
    * @return bool

    */

   public function Connected() {

-    if(!empty($this->smtp_conn)) {

+    if (!empty($this->smtp_conn)) {

       $sock_status = socket_get_status($this->smtp_conn);

-      if($sock_status["eof"]) {

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

+        if ($this->do_debug >= 1) {

+            echo "SMTP -> NOTICE:".$this->CRLF."EOF caught while checking if connected";

         }

         $this->Close();

         return false;

@@ -293,7 +293,7 @@ 
   public function Close() {

     $this->error = null; // so there is no confusion

     $this->helo_rply = null;

-    if(!empty($this->smtp_conn)) {

+    if (!empty($this->smtp_conn)) {

       // close the connection and cleanup

       fclose($this->smtp_conn);

       $this->smtp_conn = 0;

@@ -326,28 +326,28 @@ 
   public function Data($msg_data) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Data() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"DATA" . $this->CRLF);

+    fputs($this->smtp_conn, "DATA".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 354) {

+    if ($code != 354) {

       $this->error =

         array("error" => "DATA command 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -364,9 +364,9 @@ 
      */

 

     // normalize the line breaks so we know the explode works

-    $msg_data = str_replace("\r\n","\n",$msg_data);

-    $msg_data = str_replace("\r","\n",$msg_data);

-    $lines = explode("\n",$msg_data);

+    $msg_data = str_replace("\r\n", "\n", $msg_data);

+    $msg_data = str_replace("\r", "\n", $msg_data);

+    $lines = explode("\n", $msg_data);

 

     /* we need to find a good way to determine is headers are

      * in the msg_data or if it is a straight msg body

@@ -377,71 +377,71 @@ 
      * headers.

      */

 

-    $field = substr($lines[0],0,strpos($lines[0],":"));

+    $field = substr($lines[0], 0, strpos($lines[0], ":"));

     $in_headers = false;

-    if(!empty($field) && !strstr($field," ")) {

+    if (!empty($field) && !strstr($field, " ")) {

       $in_headers = true;

     }

 

     $max_line_length = 998; // used below; set here for ease in change

 

-    while(list(,$line) = @each($lines)) {

+    while (list(,$line) = @each($lines)) {

       $lines_out = null;

-      if($line == "" && $in_headers) {

+      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) {

-        $pos = strrpos(substr($line,0,$max_line_length)," ");

+      while (strlen($line) > $max_line_length) {

+        $pos = strrpos(substr($line, 0, $max_line_length), " ");

 

         // Patch to fix DOS attack

-        if(!$pos) {

+        if (!$pos) {

           $pos = $max_line_length - 1;

-          $lines_out[] = substr($line,0,$pos);

-          $line = substr($line,$pos);

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

+        if ($in_headers) {

+          $line = "\t".$line;

         }

       }

       $lines_out[] = $line;

 

       // send the lines to the server

-      while(list(,$line_out) = @each($lines_out)) {

-        if(strlen($line_out) > 0)

+      while (list(,$line_out) = @each($lines_out)) {

+        if (strlen($line_out) > 0)

         {

-          if(substr($line_out, 0, 1) == ".") {

-            $line_out = "." . $line_out;

+          if (substr($line_out, 0, 1) == ".") {

+            $line_out = ".".$line_out;

           }

         }

-        fputs($this->smtp_conn,$line_out . $this->CRLF);

+        fputs($this->smtp_conn, $line_out.$this->CRLF);

       }

     }

 

     // message data has been sent

-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);

+    fputs($this->smtp_conn, $this->CRLF.".".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "DATA 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -463,21 +463,21 @@ 
   public function Hello($host = '') {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

             "error" => "Called Hello() without being connected");

       return false;

     }

 

     // if hostname for HELO was not specified send default

-    if(empty($host)) {

+    if (empty($host)) {

       // 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("EHLO", $host)) {

+      if (!$this->SendHello("HELO", $host)) {

         return false;

       }

     }

@@ -491,22 +491,22 @@ 
    * @return bool

    */

   private function SendHello($hello, $host) {

-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);

+    fputs($this->smtp_conn, $hello." ".$host.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER: ".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

-        array("error" => $hello . " not accepted from server",

+        array("error" => $hello." 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -533,29 +533,29 @@ 
   public function Mail($from) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Mail() without being connected");

       return false;

     }

 

     $useVerp = ($this->do_verp ? "XVERP" : "");

-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);

+    fputs($this->smtp_conn, "MAIL FROM:<".$from.">".$useVerp.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "MAIL 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -576,38 +576,38 @@ 
   public function Quit($close_on_error = true) {

     $this->error = null; // so there is no confusion

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Quit() without being connected");

       return false;

     }

 

     // send the quit command to the server

-    fputs($this->smtp_conn,"quit" . $this->CRLF);

+    fputs($this->smtp_conn, "quit".$this->CRLF);

 

     // get any good-bye messages

     $byemsg = $this->get_lines();

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$byemsg.$this->CRLF.'<br />';

     }

 

     $rval = true;

     $e = null;

 

-    $code = substr($byemsg,0,3);

-    if($code != 221) {

+    $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));

+                 "smtp_rply" => substr($byemsg, 4));

       $rval = false;

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />';

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$e["error"].": ".$byemsg.$this->CRLF.'<br />';

       }

     }

 

-    if(empty($e) || $close_on_error) {

+    if (empty($e) || $close_on_error) {

       $this->Close();

     }

 

@@ -629,28 +629,28 @@ 
   public function Recipient($to) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Recipient() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);

+    fputs($this->smtp_conn, "RCPT TO:<".$to.">".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250 && $code != 251) {

+    if ($code != 250 && $code != 251) {

       $this->error =

         array("error" => "RCPT 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -672,28 +672,28 @@ 
   public function Reset() {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

               "error" => "Called Reset() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"RSET" . $this->CRLF);

+    fputs($this->smtp_conn, "RSET".$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "RSET failed",

               "smtp_code" => $code,

-              "smtp_msg" => substr($rply,4));

-      if($this->do_debug >= 1) {

-        echo "SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -720,28 +720,28 @@ 
   public function SendAndMail($from) {

     $this->error = null; // so no confusion is caused

 

-    if(!$this->connected()) {

+    if (!$this->connected()) {

       $this->error = array(

           "error" => "Called SendAndMail() without being connected");

       return false;

     }

 

-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);

+    fputs($this->smtp_conn, "SAML FROM:".$from.$this->CRLF);

 

     $rply = $this->get_lines();

-    $code = substr($rply,0,3);

+    $code = substr($rply, 0, 3);

 

-    if($this->do_debug >= 2) {

-      echo "SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />';

+    if ($this->do_debug >= 2) {

+      echo "SMTP -> FROM SERVER:".$rply.$this->CRLF.'<br />';

     }

 

-    if($code != 250) {

+    if ($code != 250) {

       $this->error =

         array("error" => "SAML 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 />';

+              "smtp_msg" => substr($rply, 4));

+      if ($this->do_debug >= 1) {

+        echo "SMTP -> ERROR: ".$this->error["error"].": ".$rply.$this->CRLF.'<br />';

       }

       return false;

     }

@@ -764,8 +764,8 @@ 
   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 />';

+    if ($this->do_debug >= 1) {

+      echo "SMTP -> NOTICE: ".$this->error["error"].$this->CRLF.'<br />';

     }

     return false;

   }

@@ -794,17 +794,17 @@ 
    */

   private function get_lines() {

     $data = "";

-    while($str = @fgets($this->smtp_conn,515)) {

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

+    while ($str = @fgets($this->smtp_conn, 515)) {

+      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) {

-        echo "SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />';

+      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 (substr($str, 3, 1) == " ") { break; }

     }

     return $data;

   }

Braces +3 added lines, -2 removed lines

@@ -143,8 +143,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();

main/inc/lib/phpseclib/Crypt/DES.php

Doc Comments +2 added lines

@@ -742,6 +742,7 @@ 
      * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC.  If not explictly set, CRYPT_DES_MODE_CBC will be used.
      *
      * @param optional Integer $mode
+     * @param integer $mode
      * @return Crypt_DES
      * @access public
      */
@@ -1445,6 +1446,7 @@ 
      *
      * @see Crypt_DES::_unpad()
      * @access private
+     * @param string $text
      */
     function _pad($text)
     {

Indentation +28 added lines, -28 removed lines

@@ -1137,7 +1137,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1332,7 +1332,7 @@ 
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                            $buffer['xor'] = substr($key, $start) . $buffer['xor'];
                     }
                 }
         }
@@ -1518,13 +1518,13 @@ 
         $t = unpack('Nl/Nr', $block);
         list($l, $r) = array($t['l'], $t['r']);
         $block = ($shuffle[$ipmap[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                 ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                 ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                 ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                 ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                 ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                 ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                 ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                    ($shuffle[$ipmap[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$ipmap[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$ipmap[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$ipmap[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$ipmap[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$ipmap[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
@@ -1540,9 +1540,9 @@ 
 
             // S-box indexing.
             $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                 $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                 $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
-                 $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
+                    $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                    $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+                    $sbox7[$b1 & 0x3F] ^ $sbox8[$b2 & 0x3F] ^ $l;
             // end of "the Feistel (F) function"
 
             $l = $r;
@@ -1551,13 +1551,13 @@ 
 
         // Perform the inverse IP permutation.
         return ($shuffle[$invipmap[($l >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-               ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-               ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-               ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-               ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-               ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-               ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-               ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ($shuffle[$invipmap[($r >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                ($shuffle[$invipmap[($l >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                ($shuffle[$invipmap[($r >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                ($shuffle[$invipmap[($l >> 8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffle[$invipmap[($r >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffle[$invipmap[$l & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffle[$invipmap[$r & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01");
     }
 
     /**
@@ -2025,13 +2025,13 @@ 
         $t = unpack('Nl/Nr', $key);
         list($l, $r) = array($t['l'], $t['r']);
         $key = ($this->shuffle[$pc1map[$r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-               ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-               ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-               ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-               ($this->shuffle[$pc1map[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-               ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-               ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-               ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+                ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+                ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+                ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+                ($this->shuffle[$pc1map[$l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+                ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
         $key = unpack('Nc/Nd', $key);
         $c = ($key['c'] >> 4) & 0x0FFFFFFF;
         $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
@@ -2045,9 +2045,9 @@ 
 
             // Perform the PC-2 transformation.
             $cp = $pc2mapc1[$c >> 24] | $pc2mapc2[($c >> 16) & 0xFF] |
-                  $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
+                    $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[$c & 0xFF];
             $dp = $pc2mapd1[$d >> 24] | $pc2mapd2[($d >> 16) & 0xFF] |
-                  $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
+                    $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[$d & 0xFF];
 
             // Reorder: odd bytes/even bytes. Push the result in key schedule.
             $keys[] = array(

Spacing +95 added lines, -95 removed lines

@@ -747,7 +747,7 @@ 
      */
     function Crypt_DES($mode = CRYPT_DES_MODE_CBC)
     {
-        if ( !defined('CRYPT_DES_MODE') ) {
+        if (!defined('CRYPT_DES_MODE')) {
             switch (true) {
                 case extension_loaded('mcrypt') && in_array('des', mcrypt_list_algorithms()):
                     define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
@@ -757,7 +757,7 @@ 
             }
         }
 
-        switch ( CRYPT_DES_MODE ) {
+        switch (CRYPT_DES_MODE) {
             case CRYPT_DES_MODE_MCRYPT:
                 switch ($mode) {
                     case CRYPT_DES_MODE_ECB:
@@ -823,7 +823,7 @@ 
      */
     function setKey($key)
     {
-        $this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
+        $this->keys = (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
         $this->enchanged = true;
         $this->dechanged = true;
     }
@@ -845,7 +845,7 @@ 
 
         switch ($method) {
             default: // 'pbkdf2'
-                list(, , $hash, $salt, $count) = func_get_args();
+                list(,, $hash, $salt, $count) = func_get_args();
                 if (!isset($hash)) {
                     $hash = 'sha1';
                 }
@@ -869,12 +869,12 @@ 
                     $hmac = new Crypt_Hash();
                     $hmac->setHash($hash);
                     $hmac->setKey($password);
-                    $f = $u = $hmac->hash($salt . pack('N', $i++));
+                    $f = $u = $hmac->hash($salt.pack('N', $i++));
                     for ($j = 2; $j <= $count; $j++) {
                         $u = $hmac->hash($u);
-                        $f^= $u;
+                        $f ^= $u;
                     }
-                    $key.= $f;
+                    $key .= $f;
                 }
         }
 
@@ -911,7 +911,7 @@ 
     function _generate_xor(&$iv)
     {
         $xor = $iv;
-        for ($j = 4; $j <= 8; $j+=4) {
+        for ($j = 4; $j <= 8; $j += 4) {
             $temp = substr($iv, -$j, 4);
             switch ($temp) {
                 case "\xFF\xFF\xFF\xFF":
@@ -953,7 +953,7 @@ 
             $plaintext = $this->_pad($plaintext);
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->enchanged) {
                 mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
                 if ($this->mode == 'ncfb') {
@@ -975,11 +975,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -992,15 +992,15 @@ 
                             mcrypt_generic_init($this->enmcrypt, $this->keys, $iv);
                             $this->enbuffer['enmcrypt_init'] = false;
                         }
-                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
+                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % 8));
                         $iv = substr($ciphertext, -8);
-                        $len%= 8;
+                        $len %= 8;
                     } else {
                         while ($len >= 8) {
                             $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, 8);
-                            $ciphertext.= $iv;
-                            $len-= 8;
-                            $i+= 8;
+                            $ciphertext .= $iv;
+                            $len -= 8;
+                            $i += 8;
                         }
                     }
                 } 
@@ -1008,7 +1008,7 @@ 
                     $iv = mcrypt_generic($this->ecb, $iv);
                     $block = $iv ^ substr($plaintext, -$len);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
@@ -1035,17 +1035,17 @@ 
         $ciphertext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
-                    $ciphertext.= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
+                    $ciphertext .= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                for ($i = 0; $i < strlen($plaintext); $i += 8) {
                     $block = substr($plaintext, $i, 8);
                     $block = $this->_processBlock($block ^ $xor, CRYPT_DES_ENCRYPT);
                     $xor = $block;
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
@@ -1054,25 +1054,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['encrypted'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['encrypted'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['encrypted']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['encrypted'] = substr($key, $start).$buffer['encrypted'];
                     }
                 }
                 break;
@@ -1091,11 +1091,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
@@ -1103,41 +1103,41 @@ 
                 }
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT) ^ substr($plaintext, $i, 8);
-                    $ciphertext.= $iv;
-                    $len-= 8;
-                    $i+= 8;
+                    $ciphertext .= $iv;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $block = $iv ^ substr($plaintext, $i);
                     $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext.= $block;
+                    $ciphertext .= $block;
                     $pos = $len;
                 }
                 return $ciphertext;
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $block = substr($plaintext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $ciphertext.= $block ^ $key;
+                        $ciphertext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($plaintext); $i+=8) {
+                    for ($i = 0; $i < strlen($plaintext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
+                        $ciphertext .= substr($plaintext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) & 7) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -1162,7 +1162,7 @@ 
             $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
         }
 
-        if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
+        if (CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT) {
             if ($this->dechanged) {
                 mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
                 if ($this->mode == 'ncfb') {
@@ -1184,11 +1184,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1196,13 +1196,13 @@ 
                 }
                 if ($len >= 8) {
                     $cb = substr($ciphertext, $i, $len - $len % 8);
-                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $plaintext .= mcrypt_generic($this->ecb, $iv.$cb) ^ $cb;
                     $iv = substr($cb, -8);
-                    $len%= 8;
+                    $len %= 8;
                 }
                 if ($len) {
                     $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $plaintext .= $iv ^ substr($ciphertext, -$len);
                     $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
                     $pos = $len;
                 }
@@ -1230,15 +1230,15 @@ 
         $plaintext = '';
         switch ($this->mode) {
             case CRYPT_DES_MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
-                    $plaintext.= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
+                    $plaintext .= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
                 }
                 break;
             case CRYPT_DES_MODE_CBC:
                 $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                     $block = substr($ciphertext, $i, 8);
-                    $plaintext.= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
+                    $plaintext .= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
                     $xor = $block;
                 }
                 if ($this->continuousBuffer) {
@@ -1248,25 +1248,25 @@ 
             case CRYPT_DES_MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
+                            $buffer['ciphertext'] .= $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
                         }
                         $key = $this->_string_shift($buffer['ciphertext']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         $key = $this->_processBlock($this->_generate_xor($xor), CRYPT_DES_ENCRYPT);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                        $buffer['ciphertext'] = substr($key, $start).$buffer['ciphertext'];
                     }
                 }
                 break;
@@ -1285,11 +1285,11 @@ 
                     $max = 8 - $pos;
                     if ($len >= $max) {
                         $i = $max;
-                        $len-= $max;
+                        $len -= $max;
                         $pos = 0;
                     } else {
                         $i = $len;
-                        $pos+= $len;
+                        $pos += $len;
                         $len = 0;
                     }
                     $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
@@ -1298,14 +1298,14 @@ 
                 while ($len >= 8) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
                     $cb = substr($ciphertext, $i, 8);
-                    $plaintext.= $iv ^ $cb;
+                    $plaintext .= $iv ^ $cb;
                     $iv = $cb;
-                    $len-= 8;
-                    $i+= 8;
+                    $len -= 8;
+                    $i += 8;
                 }
                 if ($len) {
                     $iv = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
-                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $plaintext .= $iv ^ substr($ciphertext, $i);
                     $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
                     $pos = $len;
                 }
@@ -1313,26 +1313,26 @@ 
             case CRYPT_DES_MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $block = substr($ciphertext, $i, 8);
                         if (strlen($block) > strlen($buffer['xor'])) {
                             $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                            $buffer['xor'].= $xor;
+                            $buffer['xor'] .= $xor;
                         }
                         $key = $this->_string_shift($buffer['xor']);
-                        $plaintext.= $block ^ $key;
+                        $plaintext .= $block ^ $key;
                     }
                 } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i+=8) {
+                    for ($i = 0; $i < strlen($ciphertext); $i += 8) {
                         $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
-                        $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
+                        $plaintext .= substr($ciphertext, $i, 8) ^ $xor;
                     }
                     $key = $xor;
                 }
                 if ($this->continuousBuffer) {
                     $this->decryptIV = $xor;
                     if ($start = strlen($ciphertext) % 8) {
-                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                         $buffer['xor'] = substr($key, $start).$buffer['xor'];
                     }
                 }
         }
@@ -2100,7 +2100,7 @@ 
      */
     function inline_crypt_setup($des_rounds = 1)
     {
-        $lambda_functions =& Crypt_DES::get_lambda_functions();
+        $lambda_functions = & Crypt_DES::get_lambda_functions();
         $block_size = 8;
         $mode = $this->mode;
 
@@ -2139,7 +2139,7 @@ 
                     ($shuffle[$ipmap[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
 
-                '.'' /* Extract L0 and R0 */ .'
+                '.'' /* Extract L0 and R0 */.'
                 $l = $in[1];
                 $r = $in[2];
             ';
@@ -2153,19 +2153,19 @@ 
                 // Merge key schedule.
                 for ($i = 0; $i < 8; ++$i) {
                     $_cryptBlock .= '
-                        $b1 = (($' . $r . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $r . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $r . ' >> 31) & 0x00000001)  ^ ($' . $r . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $l . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $r.' >>  3) & 0x1FFFFFFF)  ^ ($'.$r.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $r.' >> 31) & 0x00000001)  ^ ($'.$r.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $l.'  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
                               $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
                               $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $l . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $l.';
 
-                        $b1 = (($' . $l . ' >>  3) & 0x1FFFFFFF)  ^ ($' . $l . ' << 29) ^ $k_'.(++$ki).';
-                        $b2 = (($' . $l . ' >> 31) & 0x00000001)  ^ ($' . $l . ' <<  1) ^ $k_'.(++$ki).';
-                        $' . $r . '  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                        $b1 = (($' . $l.' >>  3) & 0x1FFFFFFF)  ^ ($'.$l.' << 29) ^ $k_'.(++$ki).';
+                        $b2 = (($' . $l.' >> 31) & 0x00000001)  ^ ($'.$l.' <<  1) ^ $k_'.(++$ki).';
+                        $' . $r.'  = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
                               $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
                               $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $r . ';
+                              $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $' . $r.';
                     ';
                 }
 
@@ -2177,21 +2177,21 @@ 
 
             // Perform the inverse IP permutation.
             $_cryptBlock .= '$in = (
-                    ($shuffle[$invipmap[($' . $r . ' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffle[$invipmap[($' . $r . ' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffle[$invipmap[($' . $l . ' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffle[$invipmap[($' . $r . ' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffle[$invipmap[($' . $l . ' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffle[$invipmap[ $' . $r . '        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffle[$invipmap[ $' . $l . '        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+                    ($shuffle[$invipmap[($' . $r.' >> 24) & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffle[$invipmap[($' . $l.' >> 24) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffle[$invipmap[($' . $r.' >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffle[$invipmap[($' . $l.' >> 16) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffle[$invipmap[($' . $r.' >>  8) & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffle[$invipmap[($' . $l.' >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffle[$invipmap[ $' . $r.'        & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffle[$invipmap[ $' . $l.'        & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x01")
                 );
             ';
 
             // Generating mode of operation code:
             switch ($mode) {
                 case CRYPT_DES_MODE_ECB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2205,7 +2205,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2220,7 +2220,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CBC:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2240,7 +2240,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_DECRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2262,7 +2262,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CTR:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2299,7 +2299,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);
@@ -2337,7 +2337,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_CFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $buffer = &$self->enbuffer;
@@ -2386,7 +2386,7 @@ 
                         return $ciphertext;
                     ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $buffer = &$self->debuffer;
@@ -2438,7 +2438,7 @@ 
                         ';
                     break;
                 case CRYPT_DES_MODE_OFB:
-                    $encrypt = $init_cryptBlock . '
+                    $encrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $ciphertext = "";
                         $plaintext_len = strlen($text);
@@ -2475,7 +2475,7 @@ 
                         return $ciphertext;
                         ';
 
-                    $decrypt = $init_cryptBlock . '
+                    $decrypt = $init_cryptBlock.'
                         extract($self->keys[CRYPT_DES_ENCRYPT_1DIM],  EXTR_PREFIX_ALL, "k");
                         $plaintext = "";
                         $ciphertext_len = strlen($text);