Changeset 5700 for trunk/wp-includes/class-phpmailer.php

Timestamp:

06/14/2007 02:25:30 AM (19 years ago)

Author:

ryan

Message:

Trim empty lines. Nothing but newline.

File:

• trunk/wp-includes/class-phpmailer.php (modified) (31 diffs)

trunk/wp-includes/class-phpmailer.php

@@ -114 +114 @@
      */
     var $Sendmail          = "/usr/sbin/sendmail";
-    
+
     /**
      * Path to PHPMailer plugins.  This is now only useful if the SMTP class 
@@ -223 +223 @@
     var $LE              = "\n";
     /**#@-*/
-    
+
     /////////////////////////////////////////////////
     // VARIABLE METHODS
@@ -383 +383 @@
         return $result;
     }
-    
+
     /**
      * Sends mail using the $Sendmail program.  
@@ -403 +403 @@
         fputs($mail, $header);
         fputs($mail, $body);
-        
+
         $result = pclose($mail) >> 8 & 0xFF;
         if($result != 0)
@@ -549 +549 @@
                 else
                     $this->smtp->Hello($this->ServerHostname());
-        
+
                 if($this->SMTPAuth)
                 {
@@ -605 +605 @@
         }
         $this->language = $PHPMAILER_LANG;
-    
+
         return true;
     }
@@ -630 +630 @@
         return $addr_str;
     }
-    
+
     /**
      * Formats an address correctly. 
@@ -727 +727 @@
         return $message;
     }
-    
+
     /**
      * Set the body wrapping.
@@ -736 +736 @@
         if($this->WordWrap < 1)
             return;
-            
+
         switch($this->message_type)
         {
@@ -757 +757 @@
     function CreateHeader() {
         $result = "";
-        
+
         // Set the boundaries
         $uniq_id = md5(uniqid(time()));
@@ -768 +768 @@
         else
             $result .= $this->HeaderLine("Return-Path", trim($this->Sender));
-        
+
         // To be created automatically by mail()
         if($this->Mailer != "mail")
@@ -798 +798 @@
         $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
         $result .= $this->HeaderLine("X-Priority", $this->Priority);
-        
+
         if($this->ConfirmReadingTo != "")
         {
@@ -866 +866 @@
                 $result .= $this->GetBoundary($this->boundary[1], "", 
                                               "text/html", "");
-                
+
                 $result .= $this->EncodeString($this->Body, $this->Encoding);
                 $result .= $this->LE.$this->LE;
-    
+
                 $result .= $this->EndBoundary($this->boundary[1]);
                 break;
@@ -879 +879 @@
                 $result .= $this->EncodeString($this->Body, $this->Encoding);
                 $result .= $this->LE;
-     
+
                 $result .= $this->AttachAll();
                 break;
@@ -888 +888 @@
                                    "multipart/alternative", $this->LE, 
                                    $this->boundary[2], $this->LE.$this->LE);
-    
+
                 // Create text body
                 $result .= $this->GetBoundary($this->boundary[2], "", 
@@ -895 +895 @@
                 $result .= $this->EncodeString($this->AltBody, $this->Encoding);
                 $result .= $this->LE.$this->LE;
-    
+
                 // Create the HTML body
                 $result .= $this->GetBoundary($this->boundary[2], "", 
                                               "text/html", "") . $this->LE;
-    
+
                 $result .= $this->EncodeString($this->Body, $this->Encoding);
                 $result .= $this->LE.$this->LE;
 
                 $result .= $this->EndBoundary($this->boundary[2]);
-                
+
                 $result .= $this->AttachAll();
                 break;
@@ -930 +930 @@
         $result .= $this->HeaderLine("Content-Transfer-Encoding", $encoding);
         $result .= $this->LE;
-       
+
         return $result;
     }
-    
+
     /**
      * Returns the end of a message boundary.
@@ -941 +941 @@
         return $this->LE . "--" . $boundary . "--" . $this->LE; 
     }
-    
+
     /**
      * Sets the message type.
@@ -1044 +1044 @@
             $disposition = $this->attachment[$i][6];
             $cid         = $this->attachment[$i][7];
-            
+
             $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
             $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $name, $this->LE);
@@ -1074 +1074 @@
         return join("", $mime);
     }
-    
+
     /**
      * Encodes attachment in requested format.  Returns an
@@ -1136 +1136 @@
     function EncodeHeader ($str, $position = 'text') {
       $x = 0;
-      
+
       switch (strtolower($position)) {
         case 'phrase':
@@ -1178 +1178 @@
       $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
       $encoded = trim(str_replace("\n", $this->LE, $encoded));
-      
+
       return $encoded;
     }
-    
+
     /**
      * Encode string to quoted-printable.  
@@ -1227 +1227 @@
             break;
         }
-        
+
         // Replace every spaces to _ (more readable than =20)
         $encoded = str_replace(" ", "_", $encoded);
@@ -1257 +1257 @@
         $this->attachment[$cur][7] = 0;
     }
-    
+
     /**
      * Adds an embedded attachment.  This can include images, sounds, and 
@@ -1273 +1273 @@
     function AddEmbeddedImage($path, $cid, $name = "", $encoding = "base64", 
                               $type = "application/octet-stream") {
-    
+
         if(!@is_file($path))
         {
@@ -1294 +1294 @@
         $this->attachment[$cur][6] = "inline";
         $this->attachment[$cur][7] = $cid;
-    
+
         return true;
     }
-    
+
     /**
      * Returns true if an inline attachment is present.
@@ -1313 +1313 @@
             }
         }
-        
+
         return $result;
     }
@@ -1411 +1411 @@
         return $result;
     }
-    
+
     /**
      * Returns the appropriate server variable.  Should work with both 
@@ -1429 +1429 @@
                 $_SERVER = $HTTP_ENV_VARS; // must be Apache
         }
-        
+
         if(isset($_SERVER[$varName]))
             return $_SERVER[$varName];
@@ -1460 +1460 @@
         if(count($this->language) < 1)
             $this->SetLanguage("en"); // set the default language
-    
+
         if(isset($this->language[$key]))
             return $this->language[$key];
@@ -1466 +1466 @@
             return "Language string failed to load: " . $key;
     }
-    
+
     /**
      * Returns true if an error occurred.