Code style changed, ext-user continued:

[mailer.git] / inc / phpmailer / class.smtp.php

diff --git a/inc/phpmailer/class.smtp.php b/inc/phpmailer/class.smtp.php
index be084a116e117b695b278ab460af49f3969763f6..e8bcef0cf873c4b2ba713d2d2c91d4ec1c99d957 100644 (file)
--- a/inc/phpmailer/class.smtp.php
+++ b/inc/phpmailer/class.smtp.php
@@ -57,7 +57,7 @@ class SMTP
    *  Sets VERP use on/off (default is off)
    *  @var bool
    */
-  var $do_verp = false;
+  var $do_verp = FALSE;
 
   /**#@+
    * @access private
@@ -107,7 +107,7 @@ class SMTP
       # for now we will just give an error saying we
       # are already connected
       $this->error = array("error" => "Already connected to a server");
-      return false;
+      return FALSE;
     }
 
     if(empty($port)) {
@@ -129,7 +129,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": $errstr ($errno)" . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     # sometimes the SMTP server takes a little longer to respond
@@ -149,7 +149,7 @@ class SMTP
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $announce;
     }
 
-    return true;
+    return TRUE;
   }
 
   /**
@@ -174,7 +174,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     // Send encoded username
@@ -192,7 +192,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     // Send encoded password
@@ -210,10 +210,10 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
-    return true;
+    return TRUE;
   }
 
   /**
@@ -232,11 +232,11 @@ class SMTP
                  "EOF caught while checking if connected";
         }
         $this->Close();
-        return false;
+        return FALSE;
       }
-      return true; # everything looks good
+      return TRUE; # everything looks good
     }
-    return false;
+    return FALSE;
   }
 
   /**
@@ -285,7 +285,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Data() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"DATA" . $this->CRLF);
@@ -306,7 +306,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     # the server is ready to accept data!
@@ -332,9 +332,9 @@ class SMTP
     # and we can process all lines before a blank "" line as
     # headers.
     $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
+    $in_headers = FALSE;
     if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
+      $in_headers = TRUE;
     }
 
     $max_line_length = 998; # used below; set here for ease in change
@@ -342,7 +342,7 @@ class SMTP
     while(list(,$line) = @each($lines)) {
       $lines_out = null;
       if($line == "" && $in_headers) {
-        $in_headers = false;
+        $in_headers = FALSE;
       }
       # ok we need to break this line up into several
       # smaller lines
@@ -397,9 +397,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -424,7 +424,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Expand() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"EXPN " . $name . $this->CRLF);
@@ -445,7 +445,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     # parse the reply and place in our array to return to user
@@ -475,7 +475,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
             "error" => "Called Hello() without being connected");
-      return false;
+      return FALSE;
     }
 
     # if a hostname for the HELO was not specified determine
@@ -490,10 +490,10 @@ class SMTP
     if(!$this->SendHello("EHLO", $host))
     {
       if(!$this->SendHello("HELO", $host))
-          return false;
+          return FALSE;
     }
 
-    return true;
+    return TRUE;
   }
 
   /**
@@ -520,12 +520,12 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     $this->helo_rply = $rply;
 
-    return true;
+    return TRUE;
   }
 
   /**
@@ -549,7 +549,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Help() without being connected");
-      return false;
+      return FALSE;
     }
 
     $extra = "";
@@ -575,7 +575,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
     return $rply;
@@ -601,7 +601,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Mail() without being connected");
-      return false;
+      return FALSE;
     }
 
     $useVerp = ($this->do_verp ? "XVERP" : "");
@@ -623,9 +623,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -644,7 +644,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Noop() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"NOOP" . $this->CRLF);
@@ -665,9 +665,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -687,7 +687,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Quit() without being connected");
-      return false;
+      return FALSE;
     }
 
     # send the quit command to the server
@@ -700,7 +700,7 @@ class SMTP
       echo "SMTP -> FROM SERVER:" . $this->CRLF . $byemsg;
     }
 
-    $rval = true;
+    $rval = TRUE;
     $e = null;
 
     $code = substr($byemsg,0,3);
@@ -709,7 +709,7 @@ class SMTP
       $e = array("error" => "SMTP server rejected quit command",
                  "smtp_code" => $code,
                  "smtp_rply" => substr($byemsg,4));
-      $rval = false;
+      $rval = FALSE;
       if($this->do_debug >= 1) {
         echo "SMTP -> ERROR: " . $e["error"] . ": " .
                  $byemsg . $this->CRLF;
@@ -741,7 +741,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Recipient() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
@@ -762,9 +762,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -785,7 +785,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Reset() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"RSET" . $this->CRLF);
@@ -806,10 +806,10 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
 
-    return true;
+    return TRUE;
   }
 
   /**
@@ -834,7 +834,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Send() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"SEND FROM:" . $from . $this->CRLF);
@@ -855,9 +855,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -882,7 +882,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendAndMail() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
@@ -903,9 +903,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -930,7 +930,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
           "error" => "Called SendOrMail() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"SOML FROM:" . $from . $this->CRLF);
@@ -951,9 +951,9 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
-    return true;
+    return TRUE;
   }
 
   /**
@@ -975,7 +975,7 @@ class SMTP
     if($this->do_debug >= 1) {
       echo "SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF;
     }
-    return false;
+    return FALSE;
   }
 
   /**
@@ -997,7 +997,7 @@ class SMTP
     if(!$this->connected()) {
       $this->error = array(
               "error" => "Called Verify() without being connected");
-      return false;
+      return FALSE;
     }
 
     fputs($this->smtp_conn,"VRFY " . $name . $this->CRLF);
@@ -1018,7 +1018,7 @@ class SMTP
         echo "SMTP -> ERROR: " . $this->error["error"] .
                  ": " . $rply . $this->CRLF;
       }
-      return false;
+      return FALSE;
     }
     return $rply;
   }