chamilo / chamilo-lms

main/inc/lib/extra_field.lib.php

Spacing +33 added lines, -33 removed lines

@@ -26,19 +26,19 @@ 
     );
 
     public $ops = array(
-        'eq' => '=',        //equal
-        'ne' => '<>',       //not equal
-        'lt' => '<',        //less than
-        'le' => '<=',       //less than or equal
-        'gt' => '>',        //greater than
-        'ge' => '>=',       //greater than or equal
-        'bw' => 'LIKE',     //begins with
+        'eq' => '=', //equal
+        'ne' => '<>', //not equal
+        'lt' => '<', //less than
+        'le' => '<=', //less than or equal
+        'gt' => '>', //greater than
+        'ge' => '>=', //greater than or equal
+        'bw' => 'LIKE', //begins with
         'bn' => 'NOT LIKE', //doesn't begin with
-        'in' => 'LIKE',     //is in
+        'in' => 'LIKE', //is in
         'ni' => 'NOT LIKE', //is not in
-        'ew' => 'LIKE',     //ends with
+        'ew' => 'LIKE', //ends with
         'en' => 'NOT LIKE', //doesn't end with
-        'cn' => 'LIKE',     //contains
+        'cn' => 'LIKE', //contains
         'nc' => 'NOT LIKE'  //doesn't contain
     );
 
@@ -323,7 +323,7 @@ 
      */
     public static function get_extra_fields_by_handler($handler)
     {
-        $types= array();
+        $types = array();
         $types[self::FIELD_TYPE_TEXT] = get_lang('FieldTypeText');
         $types[self::FIELD_TYPE_TEXTAREA] = get_lang('FieldTypeTextarea');
         $types[self::FIELD_TYPE_RADIO] = get_lang('FieldTypeRadio');
@@ -962,7 +962,7 @@ 
                         // chzn-select doesn't work for sessions??
                         $form->addElement(
                             'select',
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             $field_details['display_text'],
                             $options,
                             array('id' => 'extra_'.$field_details['variable'])
@@ -1021,7 +1021,7 @@ 
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
-                                $form->freeze('extra_' . $field_details['variable']);
+                                $form->freeze('extra_'.$field_details['variable']);
                             }
                         }
                         break;
@@ -1369,9 +1369,9 @@ 
 
                         if (is_array($extraData) && array_key_exists($fieldVariable, $extraData)) {
 
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::img(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     $field_details['display_text'],
                                     array('width' => '300')
                                 );
@@ -1388,10 +1388,10 @@ 
                         $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
                         $form->applyFilter('extra_'.$field_details['variable'], 'trim');
 
-                        $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+                        $allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
                         $form->addRule(
                             'extra_'.$field_details['variable'],
-                            get_lang('OnlyImagesAllowed') . ' ('.implode(',', $allowed_picture_types).')',
+                            get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')',
                             'filetype',
                             $allowed_picture_types
                         );
@@ -1433,10 +1433,10 @@ 
                         if (is_array($extraData) &&
                             array_key_exists($fieldVariable, $extraData)
                         ) {
-                            if (file_exists(api_get_path(SYS_UPLOAD_PATH) . $extraData[$fieldVariable])) {
+                            if (file_exists(api_get_path(SYS_UPLOAD_PATH).$extraData[$fieldVariable])) {
                                 $fieldTexts[] = Display::url(
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
-                                    api_get_path(WEB_UPLOAD_PATH) . $extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
+                                    api_get_path(WEB_UPLOAD_PATH).$extraData[$fieldVariable],
                                     array(
                                         'title' => $field_details['display_text'],
                                         'target' => '_blank'
@@ -1486,12 +1486,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1502,13 +1502,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1518,12 +1518,12 @@ 
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
                         );
-                        $form->applyFilter('extra_' . $field_details['variable'], 'stripslashes');
+                        $form->applyFilter('extra_'.$field_details['variable'], 'stripslashes');
 
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -1534,13 +1534,13 @@ 
                             $field_details['display_text']
                         );
                         $form->applyFilter(
-                            'extra_' . $field_details['variable'],
+                            'extra_'.$field_details['variable'],
                             'stripslashes'
                         );
                         if (!$admin_permissions) {
                             if ($field_details['visible'] == 0) {
                                 $form->freeze(
-                                    'extra_' . $field_details['variable']
+                                    'extra_'.$field_details['variable']
                                 );
                             }
                         }
@@ -2221,19 +2221,19 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $image = Display::img(
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         $field['display_text'],
                         array('width' => '300')
                     );
 
                     $displayedValue = Display::url(
                         $image,
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array('target' => '_blank')
                     );
                     break;
@@ -2242,13 +2242,13 @@ 
                         break;
                     }
 
-                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH) . $valueData['value'])) {
+                    if (!file_exists(api_get_path(SYS_UPLOAD_PATH).$valueData['value'])) {
                         break;
                     }
 
                     $displayedValue = Display::url(
                         get_lang('Download'),
-                        api_get_path(WEB_UPLOAD_PATH) . $valueData['value'],
+                        api_get_path(WEB_UPLOAD_PATH).$valueData['value'],
                         array(
                             'title' => $field['display_text'],
                             'target' => '_blank'

main/inc/lib/skill.visualizer.lib.php

Spacing +13 added lines, -13 removed lines

@@ -27,7 +27,7 @@ 
     {
         $this->skills   = $skills;
         $this->type     = $type;
-        $this->center_x = intval($offset_x + $this->canvas_x/2 - $this->block_size/2);
+        $this->center_x = intval($offset_x + $this->canvas_x / 2 - $this->block_size / 2);
     }
 
     function prepare_skill_box($skill, $position, $class)
@@ -39,9 +39,9 @@ 
             $extra_class = 'second_window';
         }
 
-        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:' . $position['y'] . 'px; left:' . $position['x'] . 'px;">';
+        $this->html .= '<div id="block_'.$block_id.'" class = "open_block window '.$extra_class.'  '.$class.'" style = "top:'.$position['y'].'px; left:'.$position['x'].'px;">';
 
-        $content =  $skill['name'];
+        $content = $skill['name'];
         $content .= '<div class="btn-group">';
         $content .= Display::url(get_lang('Edit'), '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
         $content .= Display::url('+', '#', array('id'=>'edit_block_'.$block_id, 'class'=>'edit_block btn'));
@@ -87,9 +87,9 @@ 
         }
         //default_arrow_color
 
-        $this->js .= 'var e'.$block_id.' = prepare("block_' . $block_id.'",  '.$end_point.');'."\n";
-        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_' . $skill['parent_id'].'",  '.$end_point.');'."\n";
-        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n";;
+        $this->js .= 'var e'.$block_id.' = prepare("block_'.$block_id.'",  '.$end_point.');'."\n";
+        $this->js .= 'var e'.$skill['parent_id'].' = prepare("block_'.$skill['parent_id'].'",  '.$end_point.');'."\n";
+        $this->js .= 'jsPlumb.connect({source: e'.$block_id.', target:e'.$skill['parent_id'].'});'."\n"; ;
     }
 
     /**
@@ -125,10 +125,10 @@ 
         $brothers = array();
 
         foreach ($this->skills as &$skill) {
-            if (!in_array($skill['parent_id'], array(0,1))) {
+            if (!in_array($skill['parent_id'], array(0, 1))) {
                 continue;
             }
-            $childs = isset($skill['children']) ? count($skill['children']) : 0 ;
+            $childs = isset($skill['children']) ? count($skill['children']) : 0;
 
             //$x = round($this->offsetX * sin(deg2rad($corner * $count)));
             //$y = round($this->offsetY * cos(deg2rad($corner * $count)));
@@ -144,10 +144,10 @@ 
             if ($skill['parent_id'] == 0) {
                 //$x = 130*$childs/2;
                 //$x = $this->space_between_blocks_x*$childs/2;
-                $x = $this->canvas_x/2  - $this->block_size/2;
+                $x = $this->canvas_x / 2 - $this->block_size / 2;
             } else {
                 $max = isset($this->skills[$skill['parent_id']]['children']) ? count($this->skills[$skill['parent_id']]['children']) : 0;
-                foreach($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
+                foreach ($this->skills[$skill['parent_id']]['children'] as  $id => $sk) {
                     if ($skill['id'] == $sk['id']) {
                         break;
                     }
@@ -155,17 +155,17 @@ 
                 }
                 $parent_x = isset($this->skills[$skill['parent_id']]['x']) ? $this->skills[$skill['parent_id']]['x'] : 0;
                 //$x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->space_between_blocks_x*$max/2) ;
-                $x = $my_count*$this->space_between_blocks_x + $parent_x  + $this->block_size - ($this->canvas_x/2 ) ;
+                $x = $my_count * $this->space_between_blocks_x + $parent_x + $this->block_size - ($this->canvas_x / 2);
             }
 
-            $y = $skill['level']*$this->space_between_blocks_y;
+            $y = $skill['level'] * $this->space_between_blocks_y;
 
             $skill['x'] = $x;
             $skill['y'] = $y;
 
             //$skill['description']  = "{$brothers[$skill['parent_id']]} $x - $y";
             //$skill['name']  =  $skill['name']."  |  $x = $my_count * 150  +  $parent_x - (150* $max/2) - 10*$childs ";
-            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y +$y));
+            $this->add_item($skill, array('x' => $this->offset_x + $x, 'y' => $this->offset_y + $y));
         }
         return $this->get_html();
     }

main/inc/lib/extra_field_value.lib.php

Spacing +8 added lines, -8 removed lines

@@ -209,7 +209,7 @@ 
                             break;
                     }
 
-                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE . "_{$params['item_id']}.png";
+                    $fileName = ExtraField::FIELD_TYPE_FILE_IMAGE."_{$params['item_id']}.png";
 
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
@@ -217,11 +217,11 @@ 
 
                     if ($value['error'] == 0) {
                         $imageExtraField = new Image($value['tmp_name']);
-                        $imageExtraField->send_image($fileDir . $fileName, -1, 'png');
+                        $imageExtraField->send_image($fileDir.$fileName, -1, 'png');
                         $newParams = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName,
+                            'value' => $fileDirStored.$fileName,
                             'comment' => $comment
                         );
 
@@ -247,18 +247,18 @@ 
                     }
 
                     $cleanedName = api_replace_dangerous_char($value['name']);
-                    $fileName = ExtraField::FIELD_TYPE_FILE . "_{$params['item_id']}_$cleanedName";
+                    $fileName = ExtraField::FIELD_TYPE_FILE."_{$params['item_id']}_$cleanedName";
                     if (!file_exists($fileDir)) {
                         mkdir($fileDir, $dirPermissions, true);
                     }
 
                     if ($value['error'] == 0) {
-                        moveUploadedFile($value, $fileDir . $fileName);
+                        moveUploadedFile($value, $fileDir.$fileName);
 
                         $new_params = array(
                             'item_id' => $params['item_id'],
                             'field_id' => $extraFieldInfo['id'],
-                            'value' => $fileDirStored . $fileName
+                            'value' => $fileDirStored.$fileName
                         );
 
                         if ($this->type !== 'session' && $this->type !== 'course') {
@@ -380,7 +380,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
@@ -442,7 +442,7 @@ 
                 */
                 if (false) {
                     global $app;
-                    switch($this->type) {
+                    switch ($this->type) {
                         case 'question':
                             $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());

main/inc/lib/export.lib.inc.php

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
         }
         foreach ($data as $row) {
             $string = implode("</td><td>", $row);
-            $string = '<tr><td>' . $string . '</td></tr>';
+            $string = '<tr><td>'.$string.'</td></tr>';
             if ($encoding != 'utf-8') {
                 $string = api_convert_encoding($string, $encoding, $systemEncoding);
             }
@@ -173,7 +173,7 @@ 
             fwrite($handle, '<'.$wrapper_tagname.'>');
         }
         $s = self::_export_complex_table_xml_helper($data);
-        fwrite($handle,$s);
+        fwrite($handle, $s);
         if (!is_null($wrapper_tagname)) {
             fwrite($handle, '</'.$wrapper_tagname.'>'."\n");
         }
@@ -195,10 +195,10 @@ 
         }
         $string = '';
         foreach ($data as $row) {
-            $string .= "\n".str_repeat("\t",$level).'<'.$row['name'].'>';
+            $string .= "\n".str_repeat("\t", $level).'<'.$row['name'].'>';
             if (is_array($row['value'])) {
-            	$string .= self::_export_complex_table_xml_helper($row['value'],$level+1)."\n";
-                $string .= str_repeat("\t",$level).'</'.$row['name'].'>';
+            	$string .= self::_export_complex_table_xml_helper($row['value'], $level + 1)."\n";
+                $string .= str_repeat("\t", $level).'</'.$row['name'].'>';
             } else {
                 $string .= $row['value'];
                 $string .= '</'.$row['name'].'>';

main/inc/lib/certificate.lib.php

Spacing +13 added lines, -13 removed lines

@@ -166,7 +166,7 @@ 
 
             $scoredisplay = ScoreDisplay :: instance();
             $scorecourse = $my_category[0]->calc_score($this->user_id);
-            $scorecourse_display = isset($scorecourse) ? $scoredisplay->display_score($scorecourse,SCORE_AVERAGE) : get_lang('NoResultsAvailable');
+            $scorecourse_display = isset($scorecourse) ? $scoredisplay->display_score($scorecourse, SCORE_AVERAGE) : get_lang('NoResultsAvailable');
 
             // Prepare all necessary variables:
             $organization_name = api_get_setting('Institution');
@@ -180,7 +180,7 @@ 
                 $organization_name, $stud_fn.' '.$stud_ln, $my_category[0]->get_name(),
                 $scorecourse_display
             );
-            $certif_text = str_replace("\\n","\n", $certif_text);
+            $certif_text = str_replace("\\n", "\n", $certif_text);
 
             //If the gradebook is related to skills we added the skills to the user
 
@@ -219,7 +219,7 @@ 
                             // Creating new name
                             $name = md5($this->user_id.$this->certificate_data['cat_id']).'.html';
                             $my_path_certificate = $this->certification_user_path.$name;
-                            $path_certificate    ='/'.$name;
+                            $path_certificate    = '/'.$name;
 
                             //Getting QR filename
                             $file_info = pathinfo($path_certificate);
@@ -230,7 +230,7 @@ 
                                 Display::img($this->certification_web_user_path.$file_info['filename'].'_qr.png', 'QR'),
                                 $new_content_html['content']
                             );
-                            $my_new_content_html = mb_convert_encoding($my_new_content_html,'UTF-8', api_get_system_encoding());
+                            $my_new_content_html = mb_convert_encoding($my_new_content_html, 'UTF-8', api_get_system_encoding());
 
                             $result = @file_put_contents($my_path_certificate, $my_new_content_html);
                             if ($result) {
@@ -273,8 +273,8 @@ 
         $path_certificate
     ) {
         $table_certificate = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
-        if (!UserManager::is_user_certified($cat_id,$user_id)) {
-            $sql='UPDATE '.$table_certificate.' SET path_certificate="'.Database::escape_string($path_certificate).'"
+        if (!UserManager::is_user_certified($cat_id, $user_id)) {
+            $sql = 'UPDATE '.$table_certificate.' SET path_certificate="'.Database::escape_string($path_certificate).'"
                  WHERE cat_id="'.intval($cat_id).'" AND user_id="'.intval($user_id).'" ';
             Database::query($sql);
         }
@@ -330,7 +330,7 @@ 
 
         if (!empty($content)) {
             foreach ($content as $key => $value) {
-                $my_header = str_replace(array('((', '))') , '', $headers[$key]);
+                $my_header = str_replace(array('((', '))'), '', $headers[$key]);
                 $final_content[$my_header] = $value;
             }
         }
@@ -358,11 +358,11 @@ 
             $final_content['gradebook_institution'].' - '.
             $final_content['gradebook_sitename'].' - '.
             get_lang('Certification').$break_space.
-            get_lang('Student'). ': '.$final_content['user_firstname'].' '.$final_content['user_lastname'].$break_space.
-            get_lang('Teacher'). ': '.$final_content['teacher_firstname'].' '.$final_content['teacher_lastname'].$break_space.
-            get_lang('Date'). ': '.$final_content['date_certificate'].$break_space.
-            get_lang('Score'). ': '.$final_content['gradebook_grade'].$break_space.
-            'URL'. ': '.$final_content['certificate_link'];
+            get_lang('Student').': '.$final_content['user_firstname'].' '.$final_content['user_lastname'].$break_space.
+            get_lang('Teacher').': '.$final_content['teacher_firstname'].' '.$final_content['teacher_lastname'].$break_space.
+            get_lang('Date').': '.$final_content['date_certificate'].$break_space.
+            get_lang('Score').': '.$final_content['gradebook_grade'].$break_space.
+            'URL'.': '.$final_content['certificate_link'];
 
         return $text;
     }
@@ -415,7 +415,7 @@ 
         if (!empty($this->certificate_data['path_certificate'])) {
             $user_certificate = $this->certification_user_path.basename($this->certificate_data['path_certificate']);
             if (file_exists($user_certificate)) {
-                header('Content-Type: text/html; charset='. api_get_system_encoding());
+                header('Content-Type: text/html; charset='.api_get_system_encoding());
                 echo @file_get_contents($user_certificate);
             }
         } else {

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

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;

   }

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

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/language/phpmailer.lang-ar.php

Spacing +1 added lines, -1 removed lines

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

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

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