ntwb / wordpress

src/wp-includes/class-pop3.php

Doc Comments +3 added lines

@@ -626,6 +626,9 @@
         }
     }
 
+    /**
+     * @param string $server_text
+     */
     function parse_banner ( $server_text ) {
         $outside = true;
         $banner = "";

Spacing +182 added lines, -182 removed lines

@@ -17,49 +17,49 @@ 
  */
 
 class POP3 {
-    var $ERROR      = '';       //  Error string.
+    var $ERROR      = ''; //  Error string.
 
-    var $TIMEOUT    = 60;       //  Default timeout before giving up on a
+    var $TIMEOUT    = 60; //  Default timeout before giving up on a
                                 //  network operation.
 
-    var $COUNT      = -1;       //  Mailbox msg count
+    var $COUNT      = -1; //  Mailbox msg count
 
-    var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
+    var $BUFFER     = 512; //  Socket buffer for socket fgets() calls.
                                 //  Per RFC 1939 the returned line a POP3
                                 //  server can send is 512 bytes.
 
-    var $FP         = '';       //  The connection to the server's
+    var $FP         = ''; //  The connection to the server's
                                 //  file descriptor
 
-    var $MAILSERVER = '';       // Set this to hard code the server name
+    var $MAILSERVER = ''; // Set this to hard code the server name
 
-    var $DEBUG      = FALSE;    // set to true to echo pop3
+    var $DEBUG      = FALSE; // set to true to echo pop3
                                 // commands and responses to error_log
                                 // this WILL log passwords!
 
-    var $BANNER     = '';       //  Holds the banner returned by the
+    var $BANNER     = ''; //  Holds the banner returned by the
                                 //  pop server - used for apop()
 
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
+    var $ALLOWAPOP  = FALSE; //  Allow or disallow apop()
                                 //  This must be set to true
                                 //  manually
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct ( $server = '', $timeout = '' ) {
-        settype($this->BUFFER,"integer");
-        if( !empty($server) ) {
+    function __construct($server = '', $timeout = '') {
+        settype($this->BUFFER, "integer");
+        if ( ! empty($server)) {
             // Do not allow programs to alter MAILSERVER
             // if it is already specified. They can get around
             // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
+            if (empty($this->MAILSERVER))
                 $this->MAILSERVER = $server;
         }
-        if(!empty($timeout)) {
-            settype($timeout,"integer");
+        if ( ! empty($timeout)) {
+            settype($timeout, "integer");
             $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
+            if ( ! ini_get('safe_mode'))
                 set_time_limit($timeout);
         }
         return true;
@@ -68,48 +68,48 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function POP3( $server = '', $timeout = '' ) {
-		self::__construct( $server, $timeout );
+	public function POP3($server = '', $timeout = '') {
+		self::__construct($server, $timeout);
 	}
 
-    function update_timer () {
-        if (!ini_get('safe_mode'))
+    function update_timer() {
+        if ( ! ini_get('safe_mode'))
             set_time_limit($this->TIMEOUT);
         return true;
     }
 
-    function connect ($server, $port = 110)  {
+    function connect($server, $port = 110) {
         //  Opens a socket to the specified server. Unless overridden,
         //  port defaults to 110. Returns true on success, false on fail
 
         // If MAILSERVER is set, override $server with it's value
 
-    if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
+    if ( ! isset($port) || ! $port) {$port = 110; }
+        if ( ! empty($this->MAILSERVER))
             $server = $this->MAILSERVER;
 
-        if(empty($server)){
-            $this->ERROR = "POP3 connect: " . _("No server specified");
+        if (empty($server)) {
+            $this->ERROR = "POP3 connect: "._("No server specified");
             unset($this->FP);
             return false;
         }
 
         $fp = @fsockopen("$server", $port, $errno, $errstr);
 
-        if(!$fp) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
+        if ( ! $fp) {
+            $this->ERROR = "POP3 connect: "._("Error ")."[$errno] [$errstr]";
             unset($this->FP);
             return false;
         }
 
-        socket_set_blocking($fp,-1);
+        socket_set_blocking($fp, -1);
         $this->update_timer();
-        $reply = fgets($fp,$this->BUFFER);
+        $reply = fgets($fp, $this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
-        if(!$this->is_ok($reply)) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
+        if ($this->DEBUG)
+            error_log("POP3 SEND [connect: $server] GOT [$reply]", 0);
+        if ( ! $this->is_ok($reply)) {
+            $this->ERROR = "POP3 connect: "._("Error ")."[$reply]";
             unset($this->FP);
             return false;
         }
@@ -118,39 +118,39 @@ 
         return true;
     }
 
-    function user ($user = "") {
+    function user($user = "") {
         // Sends the USER command, returns true or false
 
-        if( empty($user) ) {
-            $this->ERROR = "POP3 user: " . _("no login ID submitted");
+        if (empty($user)) {
+            $this->ERROR = "POP3 user: "._("no login ID submitted");
             return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 user: " . _("connection not established");
+        } elseif ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 user: "._("connection not established");
             return false;
         } else {
             $reply = $this->send_cmd("USER $user");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
+            if ( ! $this->is_ok($reply)) {
+                $this->ERROR = "POP3 user: "._("Error ")."[$reply]";
                 return false;
             } else
                 return true;
         }
     }
 
-    function pass ($pass = "")     {
+    function pass($pass = "") {
         // Sends the PASS command, returns # of msgs in mailbox,
         // returns false (undef) on Auth failure
 
-        if(empty($pass)) {
-            $this->ERROR = "POP3 pass: " . _("No password submitted");
+        if (empty($pass)) {
+            $this->ERROR = "POP3 pass: "._("No password submitted");
             return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 pass: " . _("connection not established");
+        } elseif ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 pass: "._("connection not established");
             return false;
         } else {
             $reply = $this->send_cmd("PASS $pass");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
+            if ( ! $this->is_ok($reply)) {
+                $this->ERROR = "POP3 pass: "._("Authentication failed")." [$reply]";
                 $this->quit();
                 return false;
             } else {
@@ -162,29 +162,29 @@ 
         }
     }
 
-    function apop ($login,$pass) {
+    function apop($login, $pass) {
         //  Attempts an APOP login. If this fails, it'll
         //  try a standard login. YOUR SERVER MUST SUPPORT
         //  THE USE OF THE APOP COMMAND!
         //  (apop is optional per rfc1939)
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 apop: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 apop: "._("No connection to server");
             return false;
-        } elseif(!$this->ALLOWAPOP) {
-            $retVal = $this->login($login,$pass);
+        } elseif ( ! $this->ALLOWAPOP) {
+            $retVal = $this->login($login, $pass);
             return $retVal;
-        } elseif(empty($login)) {
-            $this->ERROR = "POP3 apop: " . _("No login ID submitted");
+        } elseif (empty($login)) {
+            $this->ERROR = "POP3 apop: "._("No login ID submitted");
             return false;
-        } elseif(empty($pass)) {
-            $this->ERROR = "POP3 apop: " . _("No password submitted");
+        } elseif (empty($pass)) {
+            $this->ERROR = "POP3 apop: "._("No password submitted");
             return false;
         } else {
             $banner = $this->BANNER;
-            if( (!$banner) or (empty($banner)) ) {
-                $this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
-                $retVal = $this->login($login,$pass);
+            if (( ! $banner) or (empty($banner))) {
+                $this->ERROR = "POP3 apop: "._("No server banner").' - '._("abort");
+                $retVal = $this->login($login, $pass);
                 return $retVal;
             } else {
                 $AuthString = $banner;
@@ -192,9 +192,9 @@ 
                 $APOPString = md5($AuthString);
                 $cmd = "APOP $login $APOPString";
                 $reply = $this->send_cmd($cmd);
-                if(!$this->is_ok($reply)) {
-                    $this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
-                    $retVal = $this->login($login,$pass);
+                if ( ! $this->is_ok($reply)) {
+                    $this->ERROR = "POP3 apop: "._("apop authentication failed").' - '._("abort");
+                    $retVal = $this->login($login, $pass);
                     return $retVal;
                 } else {
                     //  Auth successful.
@@ -206,22 +206,22 @@ 
         }
     }
 
-    function login ($login = "", $pass = "") {
+    function login($login = "", $pass = "") {
         // Sends both user and pass. Returns # of msgs in mailbox or
         // false on failure (or -1, if the error occurs while getting
         // the number of messages.)
 
-        if( !isset($this->FP) ) {
-            $this->ERROR = "POP3 login: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 login: "._("No connection to server");
             return false;
         } else {
             $fp = $this->FP;
-            if( !$this->user( $login ) ) {
+            if ( ! $this->user($login)) {
                 //  Preserve the error generated by user()
                 return false;
             } else {
                 $count = $this->pass($pass);
-                if( (!$count) || ($count == -1) ) {
+                if (( ! $count) || ($count == -1)) {
                     //  Preserve the error generated by last() and pass()
                     return false;
                 } else
@@ -230,14 +230,14 @@ 
         }
     }
 
-    function top ($msgNum, $numLines = "0") {
+    function top($msgNum, $numLines = "0") {
         //  Gets the header and first $numLines of the msg body
         //  returns data in an array with each returned line being
         //  an array element. If $numLines is empty, returns
         //  only the header information, and none of the body.
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 top: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 top: "._("No connection to server");
             return false;
         }
         $this->update_timer();
@@ -248,94 +248,94 @@ 
         fwrite($fp, "TOP $msgNum $numLines\r\n");
         $reply = fgets($fp, $buffer);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) {
-            @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+        if ($this->DEBUG) {
+            @error_log("POP3 SEND [$cmd] GOT [$reply]", 0);
         }
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 top: "._("Error ")."[$reply]";
             return false;
         }
 
         $count = 0;
         $MsgArray = array();
 
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
+        $line = fgets($fp, $buffer);
+        while ( ! preg_match('/^\.\r\n/', $line))
         {
             $MsgArray[$count] = $line;
             $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
+            $line = fgets($fp, $buffer);
+            if (empty($line)) { break; }
         }
 
         return $MsgArray;
     }
 
-    function pop_list ($msgNum = "") {
+    function pop_list($msgNum = "") {
         //  If called with an argument, returns that msgs' size in octets
         //  No argument returns an associative array of undeleted
         //  msg numbers and their sizes in octets
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 pop_list: " . _("No connection to server");
+            $this->ERROR = "POP3 pop_list: "._("No connection to server");
             return false;
         }
         $fp = $this->FP;
         $Total = $this->COUNT;
-        if( (!$Total) or ($Total == -1) )
+        if (( ! $Total) or ($Total == -1))
         {
             return false;
         }
-        if($Total == 0)
+        if ($Total == 0)
         {
-            return array("0","0");
+            return array("0", "0");
             // return -1;   // mailbox empty
         }
 
         $this->update_timer();
 
-        if(!empty($msgNum))
+        if ( ! empty($msgNum))
         {
             $cmd = "LIST $msgNum";
-            fwrite($fp,"$cmd\r\n");
-            $reply = fgets($fp,$this->BUFFER);
+            fwrite($fp, "$cmd\r\n");
+            $reply = fgets($fp, $this->BUFFER);
             $reply = $this->strip_clf($reply);
-            if($this->DEBUG) {
-                @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+            if ($this->DEBUG) {
+                @error_log("POP3 SEND [$cmd] GOT [$reply]", 0);
             }
-            if(!$this->is_ok($reply))
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 pop_list: "._("Error ")."[$reply]";
                 return false;
             }
-            list($junk,$num,$size) = preg_split('/\s+/',$reply);
+            list($junk, $num, $size) = preg_split('/\s+/', $reply);
             return $size;
         }
         $cmd = "LIST";
         $reply = $this->send_cmd($cmd);
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
             $reply = $this->strip_clf($reply);
-            $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
+            $this->ERROR = "POP3 pop_list: "._("Error ")."[$reply]";
             return false;
         }
         $MsgArray = array();
         $MsgArray[0] = $Total;
-        for($msgC=1;$msgC <= $Total; $msgC++)
+        for ($msgC = 1; $msgC <= $Total; $msgC++)
         {
-            if($msgC > $Total) { break; }
-            $line = fgets($fp,$this->BUFFER);
+            if ($msgC > $Total) { break; }
+            $line = fgets($fp, $this->BUFFER);
             $line = $this->strip_clf($line);
-            if(strpos($line, '.') === 0)
+            if (strpos($line, '.') === 0)
             {
-                $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
+                $this->ERROR = "POP3 pop_list: "._("Premature end of list");
                 return false;
             }
-            list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
-            settype($thisMsg,"integer");
-            if($thisMsg != $msgC)
+            list($thisMsg, $msgSize) = preg_split('/\s+/', $line);
+            settype($thisMsg, "integer");
+            if ($thisMsg != $msgC)
             {
                 $MsgArray[$msgC] = "deleted";
             }
@@ -347,13 +347,13 @@ 
         return $MsgArray;
     }
 
-    function get ($msgNum) {
+    function get($msgNum) {
         //  Retrieve the specified msg number. Returns an array
         //  where each line of the msg is an array element.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 get: " . _("No connection to server");
+            $this->ERROR = "POP3 get: "._("No connection to server");
             return false;
         }
 
@@ -364,83 +364,83 @@ 
         $cmd = "RETR $msgNum";
         $reply = $this->send_cmd($cmd);
 
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 get: "._("Error ")."[$reply]";
             return false;
         }
 
         $count = 0;
         $MsgArray = array();
 
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
+        $line = fgets($fp, $buffer);
+        while ( ! preg_match('/^\.\r\n/', $line))
         {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
+            if ($line{0} == '.') { $line = substr($line, 1); }
             $MsgArray[$count] = $line;
             $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
+            $line = fgets($fp, $buffer);
+            if (empty($line)) { break; }
         }
         return $MsgArray;
     }
 
-    function last ( $type = "count" ) {
+    function last($type = "count") {
         //  Returns the highest msg number in the mailbox.
         //  returns -1 on error, 0+ on success, if type != count
         //  results in a popstat() call (2 element array returned)
 
         $last = -1;
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 last: " . _("No connection to server");
+            $this->ERROR = "POP3 last: "._("No connection to server");
             return $last;
         }
 
         $reply = $this->send_cmd("STAT");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
+            $this->ERROR = "POP3 last: "._("Error ")."[$reply]";
             return $last;
         }
 
-        $Vars = preg_split('/\s+/',$reply);
+        $Vars = preg_split('/\s+/', $reply);
         $count = $Vars[1];
         $size = $Vars[2];
-        settype($count,"integer");
-        settype($size,"integer");
-        if($type != "count")
+        settype($count, "integer");
+        settype($size, "integer");
+        if ($type != "count")
         {
-            return array($count,$size);
+            return array($count, $size);
         }
         return $count;
     }
 
-    function reset () {
+    function reset() {
         //  Resets the status of the remote server. This includes
         //  resetting the status of ALL msgs to not be deleted.
         //  This method automatically closes the connection to the server.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 reset: " . _("No connection to server");
+            $this->ERROR = "POP3 reset: "._("No connection to server");
             return false;
         }
         $reply = $this->send_cmd("RSET");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
             //  The POP3 RSET command -never- gives a -ERR
             //  response - if it ever does, something truely
             //  wild is going on.
 
-            $this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
-            @error_log("POP3 reset: ERROR [$reply]",0);
+            $this->ERROR = "POP3 reset: "._("Error ")."[$reply]";
+            @error_log("POP3 reset: ERROR [$reply]", 0);
         }
         $this->quit();
         return true;
     }
 
-    function send_cmd ( $cmd = "" )
+    function send_cmd($cmd = "")
     {
         //  Sends a user defined command string to the
         //  POP server and returns the results. Useful for
@@ -455,25 +455,25 @@ 
         //  This method works best if $cmd responds with only
         //  one line of data.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 send_cmd: " . _("No connection to server");
+            $this->ERROR = "POP3 send_cmd: "._("No connection to server");
             return false;
         }
 
-        if(empty($cmd))
+        if (empty($cmd))
         {
-            $this->ERROR = "POP3 send_cmd: " . _("Empty command string");
+            $this->ERROR = "POP3 send_cmd: "._("Empty command string");
             return "";
         }
 
         $fp = $this->FP;
         $buffer = $this->BUFFER;
         $this->update_timer();
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$buffer);
+        fwrite($fp, "$cmd\r\n");
+        $reply = fgets($fp, $buffer);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+        if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
         return $reply;
     }
 
@@ -481,61 +481,61 @@ 
         //  Closes the connection to the POP3 server, deleting
         //  any msgs marked as deleted.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 quit: " . _("connection does not exist");
+            $this->ERROR = "POP3 quit: "._("connection does not exist");
             return false;
         }
         $fp = $this->FP;
         $cmd = "QUIT";
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$this->BUFFER);
+        fwrite($fp, "$cmd\r\n");
+        $reply = fgets($fp, $this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+        if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
         fclose($fp);
         unset($this->FP);
         return true;
     }
 
-    function popstat () {
+    function popstat() {
         //  Returns an array of 2 elements. The number of undeleted
         //  msgs in the mailbox, and the size of the mbox in octets.
 
         $PopArray = $this->last("array");
 
-        if($PopArray == -1) { return false; }
+        if ($PopArray == -1) { return false; }
 
-        if( (!$PopArray) or (empty($PopArray)) )
+        if (( ! $PopArray) or (empty($PopArray)))
         {
             return false;
         }
         return $PopArray;
     }
 
-    function uidl ($msgNum = "")
+    function uidl($msgNum = "")
     {
         //  Returns the UIDL of the msg specified. If called with
         //  no arguments, returns an associative array where each
         //  undeleted msg num is a key, and the msg's uidl is the element
         //  Array element 0 will contain the total number of msgs
 
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 uidl: " . _("No connection to server");
+        if ( ! isset($this->FP)) {
+            $this->ERROR = "POP3 uidl: "._("No connection to server");
             return false;
         }
 
         $fp = $this->FP;
         $buffer = $this->BUFFER;
 
-        if(!empty($msgNum)) {
+        if ( ! empty($msgNum)) {
             $cmd = "UIDL $msgNum";
             $reply = $this->send_cmd($cmd);
-            if(!$this->is_ok($reply))
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 uidl: "._("Error ")."[$reply]";
                 return false;
             }
-            list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
+            list ($ok, $num, $myUidl) = preg_split('/\s+/', $reply);
             return $myUidl;
         } else {
             $this->update_timer();
@@ -552,20 +552,20 @@ 
             fwrite($fp, "UIDL\r\n");
             $reply = fgets($fp, $buffer);
             $reply = $this->strip_clf($reply);
-            if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-            if(!$this->is_ok($reply))
+            if ($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]", 0); }
+            if ( ! $this->is_ok($reply))
             {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+                $this->ERROR = "POP3 uidl: "._("Error ")."[$reply]";
                 return false;
             }
 
             $line = "";
             $count = 1;
-            $line = fgets($fp,$buffer);
-            while ( !preg_match('/^\.\r\n/',$line)) {
-                list ($msg,$msgUidl) = preg_split('/\s+/',$line);
+            $line = fgets($fp, $buffer);
+            while ( ! preg_match('/^\.\r\n/', $line)) {
+                list ($msg, $msgUidl) = preg_split('/\s+/', $line);
                 $msgUidl = $this->strip_clf($msgUidl);
-                if($count == $msg) {
+                if ($count == $msg) {
                     $UIDLArray[$msg] = $msgUidl;
                 }
                 else
@@ -573,30 +573,30 @@ 
                     $UIDLArray[$count] = 'deleted';
                 }
                 $count++;
-                $line = fgets($fp,$buffer);
+                $line = fgets($fp, $buffer);
             }
         }
         return $UIDLArray;
     }
 
-    function delete ($msgNum = "") {
+    function delete($msgNum = "") {
         //  Flags a specified msg as deleted. The msg will not
         //  be deleted until a quit() method is called.
 
-        if(!isset($this->FP))
+        if ( ! isset($this->FP))
         {
-            $this->ERROR = "POP3 delete: " . _("No connection to server");
+            $this->ERROR = "POP3 delete: "._("No connection to server");
             return false;
         }
-        if(empty($msgNum))
+        if (empty($msgNum))
         {
-            $this->ERROR = "POP3 delete: " . _("No msg number submitted");
+            $this->ERROR = "POP3 delete: "._("No msg number submitted");
             return false;
         }
         $reply = $this->send_cmd("DELE $msgNum");
-        if(!$this->is_ok($reply))
+        if ( ! $this->is_ok($reply))
         {
-            $this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
+            $this->ERROR = "POP3 delete: "._("Command failed ")."[$reply]";
             return false;
         }
         return true;
@@ -606,35 +606,35 @@ 
 
     //  The following methods are internal to the class.
 
-    function is_ok ($cmd = "") {
+    function is_ok($cmd = "") {
         //  Return true or false on +OK or -ERR
 
-        if( empty($cmd) )
+        if (empty($cmd))
             return false;
         else
-            return( stripos($cmd, '+OK') !== false );
+            return(stripos($cmd, '+OK') !== false);
     }
 
-    function strip_clf ($text = "") {
+    function strip_clf($text = "") {
         // Strips \r\n from server responses
 
-        if(empty($text))
+        if (empty($text))
             return $text;
         else {
-            $stripped = str_replace(array("\r","\n"),'',$text);
+            $stripped = str_replace(array("\r", "\n"), '', $text);
             return $stripped;
         }
     }
 
-    function parse_banner ( $server_text ) {
+    function parse_banner($server_text) {
         $outside = true;
         $banner = "";
         $length = strlen($server_text);
-        for($count =0; $count < $length; $count++)
+        for ($count = 0; $count < $length; $count++)
         {
-            $digit = substr($server_text,$count,1);
-            if(!empty($digit))             {
-                if( (!$outside) && ($digit != '<') && ($digit != '>') )
+            $digit = substr($server_text, $count, 1);
+            if ( ! empty($digit)) {
+                if (( ! $outside) && ($digit != '<') && ($digit != '>'))
                 {
                     $banner .= $digit;
                 }
@@ -642,21 +642,21 @@ 
                 {
                     $outside = false;
                 }
-                if($digit == '>')
+                if ($digit == '>')
                 {
                     $outside = true;
                 }
             }
         }
-        $banner = $this->strip_clf($banner);    // Just in case
+        $banner = $this->strip_clf($banner); // Just in case
         return "<$banner>";
     }
 
 }   // End class
 
 // For php4 compatibility
-if (!function_exists("stripos")) {
-    function stripos($haystack, $needle){
-        return strpos($haystack, stristr( $haystack, $needle ));
+if ( ! function_exists("stripos")) {
+    function stripos($haystack, $needle) {
+        return strpos($haystack, stristr($haystack, $needle));
     }
 }

Braces +31 added lines, -25 removed lines

@@ -53,14 +53,16 @@ 
             // Do not allow programs to alter MAILSERVER
             // if it is already specified. They can get around
             // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
-                $this->MAILSERVER = $server;
+            if(empty($this->MAILSERVER)) {
+                            $this->MAILSERVER = $server;
+            }
         }
         if(!empty($timeout)) {
             settype($timeout,"integer");
             $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
-                set_time_limit($timeout);
+            if (!ini_get('safe_mode')) {
+                            set_time_limit($timeout);
+            }
         }
         return true;
     }
@@ -73,8 +75,9 @@ 
 	}
 
     function update_timer () {
-        if (!ini_get('safe_mode'))
-            set_time_limit($this->TIMEOUT);
+        if (!ini_get('safe_mode')) {
+                    set_time_limit($this->TIMEOUT);
+        }
         return true;
     }
 
@@ -85,8 +88,9 @@ 
         // If MAILSERVER is set, override $server with it's value
 
     if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
-            $server = $this->MAILSERVER;
+        if(!empty($this->MAILSERVER)) {
+                    $server = $this->MAILSERVER;
+        }
 
         if(empty($server)){
             $this->ERROR = "POP3 connect: " . _("No server specified");
@@ -106,8 +110,9 @@ 
         $this->update_timer();
         $reply = fgets($fp,$this->BUFFER);
         $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+        if($this->DEBUG) {
+                    error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+        }
         if(!$this->is_ok($reply)) {
             $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
             unset($this->FP);
@@ -132,8 +137,9 @@ 
             if(!$this->is_ok($reply)) {
                 $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
                 return false;
-            } else
-                return true;
+            } else {
+                            return true;
+            }
         }
     }
 
@@ -224,8 +230,9 @@ 
                 if( (!$count) || ($count == -1) ) {
                     //  Preserve the error generated by last() and pass()
                     return false;
-                } else
-                    return $count;
+                } else {
+                                    return $count;
+                }
             }
         }
     }
@@ -338,8 +345,7 @@ 
             if($thisMsg != $msgC)
             {
                 $MsgArray[$msgC] = "deleted";
-            }
-            else
+            } else
             {
                 $MsgArray[$msgC] = $msgSize;
             }
@@ -567,8 +573,7 @@ 
                 $msgUidl = $this->strip_clf($msgUidl);
                 if($count == $msg) {
                     $UIDLArray[$msg] = $msgUidl;
-                }
-                else
+                } else
                 {
                     $UIDLArray[$count] = 'deleted';
                 }
@@ -609,18 +614,19 @@ 
     function is_ok ($cmd = "") {
         //  Return true or false on +OK or -ERR
 
-        if( empty($cmd) )
-            return false;
-        else
-            return( stripos($cmd, '+OK') !== false );
+        if( empty($cmd) ) {
+                    return false;
+        } else {
+                    return( stripos($cmd, '+OK') !== false );
+        }
     }
 
     function strip_clf ($text = "") {
         // Strips \r\n from server responses
 
-        if(empty($text))
-            return $text;
-        else {
+        if(empty($text)) {
+                    return $text;
+        } else {
             $stripped = str_replace(array("\r","\n"),'',$text);
             return $stripped;
         }

Indentation +617 added lines, -617 removed lines

@@ -17,53 +17,53 @@ 
  */
 
 class POP3 {
-    var $ERROR      = '';       //  Error string.
+	var $ERROR      = '';       //  Error string.
 
-    var $TIMEOUT    = 60;       //  Default timeout before giving up on a
-                                //  network operation.
+	var $TIMEOUT    = 60;       //  Default timeout before giving up on a
+								//  network operation.
 
-    var $COUNT      = -1;       //  Mailbox msg count
+	var $COUNT      = -1;       //  Mailbox msg count
 
-    var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
-                                //  Per RFC 1939 the returned line a POP3
-                                //  server can send is 512 bytes.
+	var $BUFFER     = 512;      //  Socket buffer for socket fgets() calls.
+								//  Per RFC 1939 the returned line a POP3
+								//  server can send is 512 bytes.
 
-    var $FP         = '';       //  The connection to the server's
-                                //  file descriptor
+	var $FP         = '';       //  The connection to the server's
+								//  file descriptor
 
-    var $MAILSERVER = '';       // Set this to hard code the server name
+	var $MAILSERVER = '';       // Set this to hard code the server name
 
-    var $DEBUG      = FALSE;    // set to true to echo pop3
-                                // commands and responses to error_log
-                                // this WILL log passwords!
+	var $DEBUG      = FALSE;    // set to true to echo pop3
+								// commands and responses to error_log
+								// this WILL log passwords!
 
-    var $BANNER     = '';       //  Holds the banner returned by the
-                                //  pop server - used for apop()
+	var $BANNER     = '';       //  Holds the banner returned by the
+								//  pop server - used for apop()
 
-    var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
-                                //  This must be set to true
-                                //  manually
+	var $ALLOWAPOP  = FALSE;    //  Allow or disallow apop()
+								//  This must be set to true
+								//  manually
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct ( $server = '', $timeout = '' ) {
-        settype($this->BUFFER,"integer");
-        if( !empty($server) ) {
-            // Do not allow programs to alter MAILSERVER
-            // if it is already specified. They can get around
-            // this if they -really- want to, so don't count on it.
-            if(empty($this->MAILSERVER))
-                $this->MAILSERVER = $server;
-        }
-        if(!empty($timeout)) {
-            settype($timeout,"integer");
-            $this->TIMEOUT = $timeout;
-            if (!ini_get('safe_mode'))
-                set_time_limit($timeout);
-        }
-        return true;
-    }
+	function __construct ( $server = '', $timeout = '' ) {
+		settype($this->BUFFER,"integer");
+		if( !empty($server) ) {
+			// Do not allow programs to alter MAILSERVER
+			// if it is already specified. They can get around
+			// this if they -really- want to, so don't count on it.
+			if(empty($this->MAILSERVER))
+				$this->MAILSERVER = $server;
+		}
+		if(!empty($timeout)) {
+			settype($timeout,"integer");
+			$this->TIMEOUT = $timeout;
+			if (!ini_get('safe_mode'))
+				set_time_limit($timeout);
+		}
+		return true;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -72,591 +72,591 @@ 
 		self::__construct( $server, $timeout );
 	}
 
-    function update_timer () {
-        if (!ini_get('safe_mode'))
-            set_time_limit($this->TIMEOUT);
-        return true;
-    }
-
-    function connect ($server, $port = 110)  {
-        //  Opens a socket to the specified server. Unless overridden,
-        //  port defaults to 110. Returns true on success, false on fail
-
-        // If MAILSERVER is set, override $server with its value.
-
-    if (!isset($port) || !$port) {$port = 110;}
-        if(!empty($this->MAILSERVER))
-            $server = $this->MAILSERVER;
-
-        if(empty($server)){
-            $this->ERROR = "POP3 connect: " . _("No server specified");
-            unset($this->FP);
-            return false;
-        }
-
-        $fp = @fsockopen("$server", $port, $errno, $errstr);
-
-        if(!$fp) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
-            unset($this->FP);
-            return false;
-        }
-
-        socket_set_blocking($fp,-1);
-        $this->update_timer();
-        $reply = fgets($fp,$this->BUFFER);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG)
-            error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
-        if(!$this->is_ok($reply)) {
-            $this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
-            unset($this->FP);
-            return false;
-        }
-        $this->FP = $fp;
-        $this->BANNER = $this->parse_banner($reply);
-        return true;
-    }
-
-    function user ($user = "") {
-        // Sends the USER command, returns true or false
-
-        if( empty($user) ) {
-            $this->ERROR = "POP3 user: " . _("no login ID submitted");
-            return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 user: " . _("connection not established");
-            return false;
-        } else {
-            $reply = $this->send_cmd("USER $user");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
-                return false;
-            } else
-                return true;
-        }
-    }
-
-    function pass ($pass = "")     {
-        // Sends the PASS command, returns # of msgs in mailbox,
-        // returns false (undef) on Auth failure
-
-        if(empty($pass)) {
-            $this->ERROR = "POP3 pass: " . _("No password submitted");
-            return false;
-        } elseif(!isset($this->FP)) {
-            $this->ERROR = "POP3 pass: " . _("connection not established");
-            return false;
-        } else {
-            $reply = $this->send_cmd("PASS $pass");
-            if(!$this->is_ok($reply)) {
-                $this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
-                $this->quit();
-                return false;
-            } else {
-                //  Auth successful.
-                $count = $this->last("count");
-                $this->COUNT = $count;
-                return $count;
-            }
-        }
-    }
-
-    function apop ($login,$pass) {
-        //  Attempts an APOP login. If this fails, it'll
-        //  try a standard login. YOUR SERVER MUST SUPPORT
-        //  THE USE OF THE APOP COMMAND!
-        //  (apop is optional per rfc1939)
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 apop: " . _("No connection to server");
-            return false;
-        } elseif(!$this->ALLOWAPOP) {
-            $retVal = $this->login($login,$pass);
-            return $retVal;
-        } elseif(empty($login)) {
-            $this->ERROR = "POP3 apop: " . _("No login ID submitted");
-            return false;
-        } elseif(empty($pass)) {
-            $this->ERROR = "POP3 apop: " . _("No password submitted");
-            return false;
-        } else {
-            $banner = $this->BANNER;
-            if( (!$banner) or (empty($banner)) ) {
-                $this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
-                $retVal = $this->login($login,$pass);
-                return $retVal;
-            } else {
-                $AuthString = $banner;
-                $AuthString .= $pass;
-                $APOPString = md5($AuthString);
-                $cmd = "APOP $login $APOPString";
-                $reply = $this->send_cmd($cmd);
-                if(!$this->is_ok($reply)) {
-                    $this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
-                    $retVal = $this->login($login,$pass);
-                    return $retVal;
-                } else {
-                    //  Auth successful.
-                    $count = $this->last("count");
-                    $this->COUNT = $count;
-                    return $count;
-                }
-            }
-        }
-    }
-
-    function login ($login = "", $pass = "") {
-        // Sends both user and pass. Returns # of msgs in mailbox or
-        // false on failure (or -1, if the error occurs while getting
-        // the number of messages.)
-
-        if( !isset($this->FP) ) {
-            $this->ERROR = "POP3 login: " . _("No connection to server");
-            return false;
-        } else {
-            $fp = $this->FP;
-            if( !$this->user( $login ) ) {
-                //  Preserve the error generated by user()
-                return false;
-            } else {
-                $count = $this->pass($pass);
-                if( (!$count) || ($count == -1) ) {
-                    //  Preserve the error generated by last() and pass()
-                    return false;
-                } else
-                    return $count;
-            }
-        }
-    }
-
-    function top ($msgNum, $numLines = "0") {
-        //  Gets the header and first $numLines of the msg body
-        //  returns data in an array with each returned line being
-        //  an array element. If $numLines is empty, returns
-        //  only the header information, and none of the body.
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 top: " . _("No connection to server");
-            return false;
-        }
-        $this->update_timer();
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $cmd = "TOP $msgNum $numLines";
-        fwrite($fp, "TOP $msgNum $numLines\r\n");
-        $reply = fgets($fp, $buffer);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) {
-            @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
-        }
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
-            return false;
-        }
-
-        $count = 0;
-        $MsgArray = array();
-
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
-        {
-            $MsgArray[$count] = $line;
-            $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
-        }
-
-        return $MsgArray;
-    }
-
-    function pop_list ($msgNum = "") {
-        //  If called with an argument, returns that msgs' size in octets
-        //  No argument returns an associative array of undeleted
-        //  msg numbers and their sizes in octets
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 pop_list: " . _("No connection to server");
-            return false;
-        }
-        $fp = $this->FP;
-        $Total = $this->COUNT;
-        if( (!$Total) or ($Total == -1) )
-        {
-            return false;
-        }
-        if($Total == 0)
-        {
-            return array("0","0");
-            // return -1;   // mailbox empty
-        }
-
-        $this->update_timer();
-
-        if(!empty($msgNum))
-        {
-            $cmd = "LIST $msgNum";
-            fwrite($fp,"$cmd\r\n");
-            $reply = fgets($fp,$this->BUFFER);
-            $reply = $this->strip_clf($reply);
-            if($this->DEBUG) {
-                @error_log("POP3 SEND [$cmd] GOT [$reply]",0);
-            }
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
-                return false;
-            }
-            list($junk,$num,$size) = preg_split('/\s+/',$reply);
-            return $size;
-        }
-        $cmd = "LIST";
-        $reply = $this->send_cmd($cmd);
-        if(!$this->is_ok($reply))
-        {
-            $reply = $this->strip_clf($reply);
-            $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
-            return false;
-        }
-        $MsgArray = array();
-        $MsgArray[0] = $Total;
-        for($msgC=1;$msgC <= $Total; $msgC++)
-        {
-            if($msgC > $Total) { break; }
-            $line = fgets($fp,$this->BUFFER);
-            $line = $this->strip_clf($line);
-            if(strpos($line, '.') === 0)
-            {
-                $this->ERROR = "POP3 pop_list: " . _("Premature end of list");
-                return false;
-            }
-            list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
-            settype($thisMsg,"integer");
-            if($thisMsg != $msgC)
-            {
-                $MsgArray[$msgC] = "deleted";
-            }
-            else
-            {
-                $MsgArray[$msgC] = $msgSize;
-            }
-        }
-        return $MsgArray;
-    }
-
-    function get ($msgNum) {
-        //  Retrieve the specified msg number. Returns an array
-        //  where each line of the msg is an array element.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 get: " . _("No connection to server");
-            return false;
-        }
-
-        $this->update_timer();
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $cmd = "RETR $msgNum";
-        $reply = $this->send_cmd($cmd);
-
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
-            return false;
-        }
-
-        $count = 0;
-        $MsgArray = array();
-
-        $line = fgets($fp,$buffer);
-        while ( !preg_match('/^\.\r\n/',$line))
-        {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
-            $MsgArray[$count] = $line;
-            $count++;
-            $line = fgets($fp,$buffer);
-            if(empty($line))    { break; }
-        }
-        return $MsgArray;
-    }
-
-    function last ( $type = "count" ) {
-        //  Returns the highest msg number in the mailbox.
-        //  returns -1 on error, 0+ on success, if type != count
-        //  results in a popstat() call (2 element array returned)
-
-        $last = -1;
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 last: " . _("No connection to server");
-            return $last;
-        }
-
-        $reply = $this->send_cmd("STAT");
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
-            return $last;
-        }
-
-        $Vars = preg_split('/\s+/',$reply);
-        $count = $Vars[1];
-        $size = $Vars[2];
-        settype($count,"integer");
-        settype($size,"integer");
-        if($type != "count")
-        {
-            return array($count,$size);
-        }
-        return $count;
-    }
-
-    function reset () {
-        //  Resets the status of the remote server. This includes
-        //  resetting the status of ALL msgs to not be deleted.
-        //  This method automatically closes the connection to the server.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 reset: " . _("No connection to server");
-            return false;
-        }
-        $reply = $this->send_cmd("RSET");
-        if(!$this->is_ok($reply))
-        {
-            //  The POP3 RSET command -never- gives a -ERR
-            //  response - if it ever does, something truely
-            //  wild is going on.
-
-            $this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
-            @error_log("POP3 reset: ERROR [$reply]",0);
-        }
-        $this->quit();
-        return true;
-    }
-
-    function send_cmd ( $cmd = "" )
-    {
-        //  Sends a user defined command string to the
-        //  POP server and returns the results. Useful for
-        //  non-compliant or custom POP servers.
-        //  Do NOT includ the \r\n as part of your command
-        //  string - it will be appended automatically.
-
-        //  The return value is a standard fgets() call, which
-        //  will read up to $this->BUFFER bytes of data, until it
-        //  encounters a new line, or EOF, whichever happens first.
-
-        //  This method works best if $cmd responds with only
-        //  one line of data.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 send_cmd: " . _("No connection to server");
-            return false;
-        }
-
-        if(empty($cmd))
-        {
-            $this->ERROR = "POP3 send_cmd: " . _("Empty command string");
-            return "";
-        }
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-        $this->update_timer();
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$buffer);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-        return $reply;
-    }
-
-    function quit() {
-        //  Closes the connection to the POP3 server, deleting
-        //  any msgs marked as deleted.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 quit: " . _("connection does not exist");
-            return false;
-        }
-        $fp = $this->FP;
-        $cmd = "QUIT";
-        fwrite($fp,"$cmd\r\n");
-        $reply = fgets($fp,$this->BUFFER);
-        $reply = $this->strip_clf($reply);
-        if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-        fclose($fp);
-        unset($this->FP);
-        return true;
-    }
-
-    function popstat () {
-        //  Returns an array of 2 elements. The number of undeleted
-        //  msgs in the mailbox, and the size of the mbox in octets.
-
-        $PopArray = $this->last("array");
-
-        if($PopArray == -1) { return false; }
-
-        if( (!$PopArray) or (empty($PopArray)) )
-        {
-            return false;
-        }
-        return $PopArray;
-    }
-
-    function uidl ($msgNum = "")
-    {
-        //  Returns the UIDL of the msg specified. If called with
-        //  no arguments, returns an associative array where each
-        //  undeleted msg num is a key, and the msg's uidl is the element
-        //  Array element 0 will contain the total number of msgs
-
-        if(!isset($this->FP)) {
-            $this->ERROR = "POP3 uidl: " . _("No connection to server");
-            return false;
-        }
-
-        $fp = $this->FP;
-        $buffer = $this->BUFFER;
-
-        if(!empty($msgNum)) {
-            $cmd = "UIDL $msgNum";
-            $reply = $this->send_cmd($cmd);
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
-                return false;
-            }
-            list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
-            return $myUidl;
-        } else {
-            $this->update_timer();
-
-            $UIDLArray = array();
-            $Total = $this->COUNT;
-            $UIDLArray[0] = $Total;
-
-            if ($Total < 1)
-            {
-                return $UIDLArray;
-            }
-            $cmd = "UIDL";
-            fwrite($fp, "UIDL\r\n");
-            $reply = fgets($fp, $buffer);
-            $reply = $this->strip_clf($reply);
-            if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
-            if(!$this->is_ok($reply))
-            {
-                $this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
-                return false;
-            }
-
-            $line = "";
-            $count = 1;
-            $line = fgets($fp,$buffer);
-            while ( !preg_match('/^\.\r\n/',$line)) {
-                list ($msg,$msgUidl) = preg_split('/\s+/',$line);
-                $msgUidl = $this->strip_clf($msgUidl);
-                if($count == $msg) {
-                    $UIDLArray[$msg] = $msgUidl;
-                }
-                else
-                {
-                    $UIDLArray[$count] = 'deleted';
-                }
-                $count++;
-                $line = fgets($fp,$buffer);
-            }
-        }
-        return $UIDLArray;
-    }
-
-    function delete ($msgNum = "") {
-        //  Flags a specified msg as deleted. The msg will not
-        //  be deleted until a quit() method is called.
-
-        if(!isset($this->FP))
-        {
-            $this->ERROR = "POP3 delete: " . _("No connection to server");
-            return false;
-        }
-        if(empty($msgNum))
-        {
-            $this->ERROR = "POP3 delete: " . _("No msg number submitted");
-            return false;
-        }
-        $reply = $this->send_cmd("DELE $msgNum");
-        if(!$this->is_ok($reply))
-        {
-            $this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
-            return false;
-        }
-        return true;
-    }
-
-    //  *********************************************************
-
-    //  The following methods are internal to the class.
-
-    function is_ok ($cmd = "") {
-        //  Return true or false on +OK or -ERR
-
-        if( empty($cmd) )
-            return false;
-        else
-            return( stripos($cmd, '+OK') !== false );
-    }
-
-    function strip_clf ($text = "") {
-        // Strips \r\n from server responses
-
-        if(empty($text))
-            return $text;
-        else {
-            $stripped = str_replace(array("\r","\n"),'',$text);
-            return $stripped;
-        }
-    }
-
-    function parse_banner ( $server_text ) {
-        $outside = true;
-        $banner = "";
-        $length = strlen($server_text);
-        for($count =0; $count < $length; $count++)
-        {
-            $digit = substr($server_text,$count,1);
-            if(!empty($digit))             {
-                if( (!$outside) && ($digit != '<') && ($digit != '>') )
-                {
-                    $banner .= $digit;
-                }
-                if ($digit == '<')
-                {
-                    $outside = false;
-                }
-                if($digit == '>')
-                {
-                    $outside = true;
-                }
-            }
-        }
-        $banner = $this->strip_clf($banner);    // Just in case
-        return "<$banner>";
-    }
+	function update_timer () {
+		if (!ini_get('safe_mode'))
+			set_time_limit($this->TIMEOUT);
+		return true;
+	}
+
+	function connect ($server, $port = 110)  {
+		//  Opens a socket to the specified server. Unless overridden,
+		//  port defaults to 110. Returns true on success, false on fail
+
+		// If MAILSERVER is set, override $server with its value.
+
+	if (!isset($port) || !$port) {$port = 110;}
+		if(!empty($this->MAILSERVER))
+			$server = $this->MAILSERVER;
+
+		if(empty($server)){
+			$this->ERROR = "POP3 connect: " . _("No server specified");
+			unset($this->FP);
+			return false;
+		}
+
+		$fp = @fsockopen("$server", $port, $errno, $errstr);
+
+		if(!$fp) {
+			$this->ERROR = "POP3 connect: " . _("Error ") . "[$errno] [$errstr]";
+			unset($this->FP);
+			return false;
+		}
+
+		socket_set_blocking($fp,-1);
+		$this->update_timer();
+		$reply = fgets($fp,$this->BUFFER);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG)
+			error_log("POP3 SEND [connect: $server] GOT [$reply]",0);
+		if(!$this->is_ok($reply)) {
+			$this->ERROR = "POP3 connect: " . _("Error ") . "[$reply]";
+			unset($this->FP);
+			return false;
+		}
+		$this->FP = $fp;
+		$this->BANNER = $this->parse_banner($reply);
+		return true;
+	}
+
+	function user ($user = "") {
+		// Sends the USER command, returns true or false
+
+		if( empty($user) ) {
+			$this->ERROR = "POP3 user: " . _("no login ID submitted");
+			return false;
+		} elseif(!isset($this->FP)) {
+			$this->ERROR = "POP3 user: " . _("connection not established");
+			return false;
+		} else {
+			$reply = $this->send_cmd("USER $user");
+			if(!$this->is_ok($reply)) {
+				$this->ERROR = "POP3 user: " . _("Error ") . "[$reply]";
+				return false;
+			} else
+				return true;
+		}
+	}
+
+	function pass ($pass = "")     {
+		// Sends the PASS command, returns # of msgs in mailbox,
+		// returns false (undef) on Auth failure
+
+		if(empty($pass)) {
+			$this->ERROR = "POP3 pass: " . _("No password submitted");
+			return false;
+		} elseif(!isset($this->FP)) {
+			$this->ERROR = "POP3 pass: " . _("connection not established");
+			return false;
+		} else {
+			$reply = $this->send_cmd("PASS $pass");
+			if(!$this->is_ok($reply)) {
+				$this->ERROR = "POP3 pass: " . _("Authentication failed") . " [$reply]";
+				$this->quit();
+				return false;
+			} else {
+				//  Auth successful.
+				$count = $this->last("count");
+				$this->COUNT = $count;
+				return $count;
+			}
+		}
+	}
+
+	function apop ($login,$pass) {
+		//  Attempts an APOP login. If this fails, it'll
+		//  try a standard login. YOUR SERVER MUST SUPPORT
+		//  THE USE OF THE APOP COMMAND!
+		//  (apop is optional per rfc1939)
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 apop: " . _("No connection to server");
+			return false;
+		} elseif(!$this->ALLOWAPOP) {
+			$retVal = $this->login($login,$pass);
+			return $retVal;
+		} elseif(empty($login)) {
+			$this->ERROR = "POP3 apop: " . _("No login ID submitted");
+			return false;
+		} elseif(empty($pass)) {
+			$this->ERROR = "POP3 apop: " . _("No password submitted");
+			return false;
+		} else {
+			$banner = $this->BANNER;
+			if( (!$banner) or (empty($banner)) ) {
+				$this->ERROR = "POP3 apop: " . _("No server banner") . ' - ' . _("abort");
+				$retVal = $this->login($login,$pass);
+				return $retVal;
+			} else {
+				$AuthString = $banner;
+				$AuthString .= $pass;
+				$APOPString = md5($AuthString);
+				$cmd = "APOP $login $APOPString";
+				$reply = $this->send_cmd($cmd);
+				if(!$this->is_ok($reply)) {
+					$this->ERROR = "POP3 apop: " . _("apop authentication failed") . ' - ' . _("abort");
+					$retVal = $this->login($login,$pass);
+					return $retVal;
+				} else {
+					//  Auth successful.
+					$count = $this->last("count");
+					$this->COUNT = $count;
+					return $count;
+				}
+			}
+		}
+	}
+
+	function login ($login = "", $pass = "") {
+		// Sends both user and pass. Returns # of msgs in mailbox or
+		// false on failure (or -1, if the error occurs while getting
+		// the number of messages.)
+
+		if( !isset($this->FP) ) {
+			$this->ERROR = "POP3 login: " . _("No connection to server");
+			return false;
+		} else {
+			$fp = $this->FP;
+			if( !$this->user( $login ) ) {
+				//  Preserve the error generated by user()
+				return false;
+			} else {
+				$count = $this->pass($pass);
+				if( (!$count) || ($count == -1) ) {
+					//  Preserve the error generated by last() and pass()
+					return false;
+				} else
+					return $count;
+			}
+		}
+	}
+
+	function top ($msgNum, $numLines = "0") {
+		//  Gets the header and first $numLines of the msg body
+		//  returns data in an array with each returned line being
+		//  an array element. If $numLines is empty, returns
+		//  only the header information, and none of the body.
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 top: " . _("No connection to server");
+			return false;
+		}
+		$this->update_timer();
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$cmd = "TOP $msgNum $numLines";
+		fwrite($fp, "TOP $msgNum $numLines\r\n");
+		$reply = fgets($fp, $buffer);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) {
+			@error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+		}
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 top: " . _("Error ") . "[$reply]";
+			return false;
+		}
+
+		$count = 0;
+		$MsgArray = array();
+
+		$line = fgets($fp,$buffer);
+		while ( !preg_match('/^\.\r\n/',$line))
+		{
+			$MsgArray[$count] = $line;
+			$count++;
+			$line = fgets($fp,$buffer);
+			if(empty($line))    { break; }
+		}
+
+		return $MsgArray;
+	}
+
+	function pop_list ($msgNum = "") {
+		//  If called with an argument, returns that msgs' size in octets
+		//  No argument returns an associative array of undeleted
+		//  msg numbers and their sizes in octets
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 pop_list: " . _("No connection to server");
+			return false;
+		}
+		$fp = $this->FP;
+		$Total = $this->COUNT;
+		if( (!$Total) or ($Total == -1) )
+		{
+			return false;
+		}
+		if($Total == 0)
+		{
+			return array("0","0");
+			// return -1;   // mailbox empty
+		}
+
+		$this->update_timer();
+
+		if(!empty($msgNum))
+		{
+			$cmd = "LIST $msgNum";
+			fwrite($fp,"$cmd\r\n");
+			$reply = fgets($fp,$this->BUFFER);
+			$reply = $this->strip_clf($reply);
+			if($this->DEBUG) {
+				@error_log("POP3 SEND [$cmd] GOT [$reply]",0);
+			}
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
+				return false;
+			}
+			list($junk,$num,$size) = preg_split('/\s+/',$reply);
+			return $size;
+		}
+		$cmd = "LIST";
+		$reply = $this->send_cmd($cmd);
+		if(!$this->is_ok($reply))
+		{
+			$reply = $this->strip_clf($reply);
+			$this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
+			return false;
+		}
+		$MsgArray = array();
+		$MsgArray[0] = $Total;
+		for($msgC=1;$msgC <= $Total; $msgC++)
+		{
+			if($msgC > $Total) { break; }
+			$line = fgets($fp,$this->BUFFER);
+			$line = $this->strip_clf($line);
+			if(strpos($line, '.') === 0)
+			{
+				$this->ERROR = "POP3 pop_list: " . _("Premature end of list");
+				return false;
+			}
+			list($thisMsg,$msgSize) = preg_split('/\s+/',$line);
+			settype($thisMsg,"integer");
+			if($thisMsg != $msgC)
+			{
+				$MsgArray[$msgC] = "deleted";
+			}
+			else
+			{
+				$MsgArray[$msgC] = $msgSize;
+			}
+		}
+		return $MsgArray;
+	}
+
+	function get ($msgNum) {
+		//  Retrieve the specified msg number. Returns an array
+		//  where each line of the msg is an array element.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 get: " . _("No connection to server");
+			return false;
+		}
+
+		$this->update_timer();
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$cmd = "RETR $msgNum";
+		$reply = $this->send_cmd($cmd);
+
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 get: " . _("Error ") . "[$reply]";
+			return false;
+		}
+
+		$count = 0;
+		$MsgArray = array();
+
+		$line = fgets($fp,$buffer);
+		while ( !preg_match('/^\.\r\n/',$line))
+		{
+			if ( $line{0} == '.' ) { $line = substr($line,1); }
+			$MsgArray[$count] = $line;
+			$count++;
+			$line = fgets($fp,$buffer);
+			if(empty($line))    { break; }
+		}
+		return $MsgArray;
+	}
+
+	function last ( $type = "count" ) {
+		//  Returns the highest msg number in the mailbox.
+		//  returns -1 on error, 0+ on success, if type != count
+		//  results in a popstat() call (2 element array returned)
+
+		$last = -1;
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 last: " . _("No connection to server");
+			return $last;
+		}
+
+		$reply = $this->send_cmd("STAT");
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 last: " . _("Error ") . "[$reply]";
+			return $last;
+		}
+
+		$Vars = preg_split('/\s+/',$reply);
+		$count = $Vars[1];
+		$size = $Vars[2];
+		settype($count,"integer");
+		settype($size,"integer");
+		if($type != "count")
+		{
+			return array($count,$size);
+		}
+		return $count;
+	}
+
+	function reset () {
+		//  Resets the status of the remote server. This includes
+		//  resetting the status of ALL msgs to not be deleted.
+		//  This method automatically closes the connection to the server.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 reset: " . _("No connection to server");
+			return false;
+		}
+		$reply = $this->send_cmd("RSET");
+		if(!$this->is_ok($reply))
+		{
+			//  The POP3 RSET command -never- gives a -ERR
+			//  response - if it ever does, something truely
+			//  wild is going on.
+
+			$this->ERROR = "POP3 reset: " . _("Error ") . "[$reply]";
+			@error_log("POP3 reset: ERROR [$reply]",0);
+		}
+		$this->quit();
+		return true;
+	}
+
+	function send_cmd ( $cmd = "" )
+	{
+		//  Sends a user defined command string to the
+		//  POP server and returns the results. Useful for
+		//  non-compliant or custom POP servers.
+		//  Do NOT includ the \r\n as part of your command
+		//  string - it will be appended automatically.
+
+		//  The return value is a standard fgets() call, which
+		//  will read up to $this->BUFFER bytes of data, until it
+		//  encounters a new line, or EOF, whichever happens first.
+
+		//  This method works best if $cmd responds with only
+		//  one line of data.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 send_cmd: " . _("No connection to server");
+			return false;
+		}
+
+		if(empty($cmd))
+		{
+			$this->ERROR = "POP3 send_cmd: " . _("Empty command string");
+			return "";
+		}
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+		$this->update_timer();
+		fwrite($fp,"$cmd\r\n");
+		$reply = fgets($fp,$buffer);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+		return $reply;
+	}
+
+	function quit() {
+		//  Closes the connection to the POP3 server, deleting
+		//  any msgs marked as deleted.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 quit: " . _("connection does not exist");
+			return false;
+		}
+		$fp = $this->FP;
+		$cmd = "QUIT";
+		fwrite($fp,"$cmd\r\n");
+		$reply = fgets($fp,$this->BUFFER);
+		$reply = $this->strip_clf($reply);
+		if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+		fclose($fp);
+		unset($this->FP);
+		return true;
+	}
+
+	function popstat () {
+		//  Returns an array of 2 elements. The number of undeleted
+		//  msgs in the mailbox, and the size of the mbox in octets.
+
+		$PopArray = $this->last("array");
+
+		if($PopArray == -1) { return false; }
+
+		if( (!$PopArray) or (empty($PopArray)) )
+		{
+			return false;
+		}
+		return $PopArray;
+	}
+
+	function uidl ($msgNum = "")
+	{
+		//  Returns the UIDL of the msg specified. If called with
+		//  no arguments, returns an associative array where each
+		//  undeleted msg num is a key, and the msg's uidl is the element
+		//  Array element 0 will contain the total number of msgs
+
+		if(!isset($this->FP)) {
+			$this->ERROR = "POP3 uidl: " . _("No connection to server");
+			return false;
+		}
+
+		$fp = $this->FP;
+		$buffer = $this->BUFFER;
+
+		if(!empty($msgNum)) {
+			$cmd = "UIDL $msgNum";
+			$reply = $this->send_cmd($cmd);
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+				return false;
+			}
+			list ($ok,$num,$myUidl) = preg_split('/\s+/',$reply);
+			return $myUidl;
+		} else {
+			$this->update_timer();
+
+			$UIDLArray = array();
+			$Total = $this->COUNT;
+			$UIDLArray[0] = $Total;
+
+			if ($Total < 1)
+			{
+				return $UIDLArray;
+			}
+			$cmd = "UIDL";
+			fwrite($fp, "UIDL\r\n");
+			$reply = fgets($fp, $buffer);
+			$reply = $this->strip_clf($reply);
+			if($this->DEBUG) { @error_log("POP3 SEND [$cmd] GOT [$reply]",0); }
+			if(!$this->is_ok($reply))
+			{
+				$this->ERROR = "POP3 uidl: " . _("Error ") . "[$reply]";
+				return false;
+			}
+
+			$line = "";
+			$count = 1;
+			$line = fgets($fp,$buffer);
+			while ( !preg_match('/^\.\r\n/',$line)) {
+				list ($msg,$msgUidl) = preg_split('/\s+/',$line);
+				$msgUidl = $this->strip_clf($msgUidl);
+				if($count == $msg) {
+					$UIDLArray[$msg] = $msgUidl;
+				}
+				else
+				{
+					$UIDLArray[$count] = 'deleted';
+				}
+				$count++;
+				$line = fgets($fp,$buffer);
+			}
+		}
+		return $UIDLArray;
+	}
+
+	function delete ($msgNum = "") {
+		//  Flags a specified msg as deleted. The msg will not
+		//  be deleted until a quit() method is called.
+
+		if(!isset($this->FP))
+		{
+			$this->ERROR = "POP3 delete: " . _("No connection to server");
+			return false;
+		}
+		if(empty($msgNum))
+		{
+			$this->ERROR = "POP3 delete: " . _("No msg number submitted");
+			return false;
+		}
+		$reply = $this->send_cmd("DELE $msgNum");
+		if(!$this->is_ok($reply))
+		{
+			$this->ERROR = "POP3 delete: " . _("Command failed ") . "[$reply]";
+			return false;
+		}
+		return true;
+	}
+
+	//  *********************************************************
+
+	//  The following methods are internal to the class.
+
+	function is_ok ($cmd = "") {
+		//  Return true or false on +OK or -ERR
+
+		if( empty($cmd) )
+			return false;
+		else
+			return( stripos($cmd, '+OK') !== false );
+	}
+
+	function strip_clf ($text = "") {
+		// Strips \r\n from server responses
+
+		if(empty($text))
+			return $text;
+		else {
+			$stripped = str_replace(array("\r","\n"),'',$text);
+			return $stripped;
+		}
+	}
+
+	function parse_banner ( $server_text ) {
+		$outside = true;
+		$banner = "";
+		$length = strlen($server_text);
+		for($count =0; $count < $length; $count++)
+		{
+			$digit = substr($server_text,$count,1);
+			if(!empty($digit))             {
+				if( (!$outside) && ($digit != '<') && ($digit != '>') )
+				{
+					$banner .= $digit;
+				}
+				if ($digit == '<')
+				{
+					$outside = false;
+				}
+				if($digit == '>')
+				{
+					$outside = true;
+				}
+			}
+		}
+		$banner = $this->strip_clf($banner);    // Just in case
+		return "<$banner>";
+	}
 
 }   // End class
 
 // For php4 compatibility
 if (!function_exists("stripos")) {
-    function stripos($haystack, $needle){
-        return strpos($haystack, stristr( $haystack, $needle ));
-    }
+	function stripos($haystack, $needle){
+		return strpos($haystack, stristr( $haystack, $needle ));
+	}
 }

src/wp-includes/class-simplepie.php

Doc Comments +6 added lines, -6 removed lines

@@ -1614,7 +1614,7 @@ 
 	/**
 	 * Get the error message for the occurred error.
 	 *
-	 * @return string|array Error message, or array of messages for multifeeds
+	 * @return string Error message, or array of messages for multifeeds
 	 */
 	public function error()
 	{
@@ -1627,7 +1627,7 @@ 
 	 * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
 	 * the data instead of printing it.
 	 *
-	 * @return string|boolean Raw XML data, false if the cache is used
+	 * @return string Raw XML data, false if the cache is used
 	 */
 	public function get_raw_data()
 	{
@@ -2607,7 +2607,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -2636,7 +2636,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{
@@ -2778,7 +2778,7 @@ 
 	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_width()
 	{
@@ -2804,7 +2804,7 @@ 
 	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
 	 * the feed is an RSS 2.0 feed.
 	 *
-	 * @return int|float|null
+	 * @return double|null
 	 */
 	public function get_image_height()
 	{

Braces +92 added lines, -180 removed lines

@@ -22,8 +22,9 @@ 
  * @since 3.5.0
  */
 function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
-		return;
+	if ( 0 !== strpos( $class, 'SimplePie_' ) ) {
+			return;
+	}
 
 	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
 	include( $file );
@@ -784,8 +785,7 @@ 
 			{
 				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
 			}
-		}
-		else
+		} else
 		{
 			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
 		}
@@ -920,8 +920,7 @@ 
 		if ($encoding)
 		{
 			$this->input_encoding = (string) $encoding;
-		}
-		else
+		} else
 		{
 			$this->input_encoding = false;
 		}
@@ -1238,8 +1237,7 @@ 
 		if ($page !== false)
 		{
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
+		} else
 		{
 			$this->image_handler = '';
 		}
@@ -1317,8 +1315,7 @@ 
 				$i++;
 			}
 			return (bool) $success;
-		}
-		elseif ($this->feed_url === null && $this->raw_data === null)
+		} elseif ($this->feed_url === null && $this->raw_data === null)
 		{
 			return false;
 		}
@@ -1342,8 +1339,7 @@ 
 			if (($fetched = $this->fetch_data($cache)) === true)
 			{
 				return true;
-			}
-			elseif ($fetched === false) {
+			} elseif ($fetched === false) {
 				return false;
 			}
 
@@ -1373,8 +1369,7 @@ 
 				}
 				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
 				$encodings[] = 'UTF-8';
-			}
-			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+			} elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
 			{
 				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
 				{
@@ -1437,8 +1432,7 @@ 
 		{
 			// We have an error, just set SimplePie_Misc::error to it and quit
 			$this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-		}
-		else
+		} else
 		{
 			$this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
 		}
@@ -1520,8 +1514,7 @@ 
 								$cache->touch();
 								return true;
 							}
-						}
-						else
+						} else
 						{
 							unset($file);
 						}
@@ -1547,8 +1540,7 @@ 
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
 				$file =& $this->file;
-			}
-			else
+			} else
 			{
 				$headers = array(
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
@@ -1580,8 +1572,7 @@ 
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
-				}
-				catch (SimplePie_Exception $e)
+				} catch (SimplePie_Exception $e)
 				{
 					// This is usually because DOMDocument doesn't exist
 					$this->error = $e->getMessage();
@@ -1672,8 +1663,7 @@ 
 			if ($this->get_encoding())
 			{
 				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
+			} else
 			{
 				$header .= ' charset=UTF-8';
 			}
@@ -1715,12 +1705,10 @@ 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
 			{
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
 				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
@@ -1736,8 +1724,7 @@ 
 				{
 					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
 				}
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
 			{
 				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
@@ -1778,8 +1765,7 @@ 
 							break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
 			}
@@ -1804,8 +1790,7 @@ 
 		if ($this->feed_url !== null)
 		{
 			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2000,12 +1985,10 @@ 
 		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
-		}
-		elseif ($this->get_link() !== null)
+		} elseif ($this->get_link() !== null)
 		{
 			return $this->get_link();
-		}
-		else
+		} else
 		{
 			return $this->subscribe_url();
 		}
@@ -2039,32 +2022,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2083,8 +2059,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2129,8 +2104,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -2148,8 +2122,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2168,8 +2141,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2246,8 +2218,7 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2266,8 +2237,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2332,8 +2302,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2353,8 +2322,7 @@ 
 		if (isset($links[$key]))
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2435,13 +2403,11 @@ 
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
+					} else
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
-				}
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -2452,8 +2418,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2478,40 +2443,31 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2530,24 +2486,19 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2566,32 +2517,25 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
 		{
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['headers']['content-language']))
+		} elseif (isset($this->data['headers']['content-language']))
 		{
 			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2615,12 +2559,10 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2643,16 +2585,13 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2672,24 +2611,19 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2711,28 +2645,22 @@ 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
 		{
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2755,16 +2683,13 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2785,12 +2710,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 88.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2811,12 +2734,10 @@ 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
 		{
 			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
 		{
 			return 31.0;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2838,8 +2759,7 @@ 
 		if ($max === 0)
 		{
 			return $qty;
-		}
-		else
+		} else
 		{
 			return ($qty > $max) ? $max : $qty;
 		}
@@ -2863,8 +2783,7 @@ 
 		if (isset($items[$key]))
 		{
 			return $items[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2890,8 +2809,7 @@ 
 			if (!empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-			}
-			else
+			} else
 			{
 				$this->data['items'] = array();
 				if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
@@ -2961,8 +2879,7 @@ 
 					}
 				}
 				$items = $this->data['ordered_items'];
-			}
-			else
+			} else
 			{
 				$items = $this->data['items'];
 			}
@@ -2971,13 +2888,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			return array();
 		}
@@ -3078,8 +2993,7 @@ 
 				if ($arg instanceof SimplePie)
 				{
 					$items = array_merge($items, $arg->get_items(0, $limit));
-				}
-				else
+				} else
 				{
 					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
 				}
@@ -3103,13 +3017,11 @@ 
 			if ($end === 0)
 			{
 				return array_slice($items, $start);
-			}
-			else
+			} else
 			{
 				return array_slice($items, $start, $end);
 			}
-		}
-		else
+		} else
 		{
 			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
 			return array();

Spacing +65 added lines, -65 removed lines

@@ -1,38 +1,38 @@ 
 <?php
-if ( ! class_exists( 'SimplePie', false ) ) :
+if ( ! class_exists('SimplePie', false)) :
 
 // Load classes we will need.
-require ABSPATH . WPINC . '/SimplePie/Misc.php';
-require ABSPATH . WPINC . '/SimplePie/Cache.php';
-require ABSPATH . WPINC . '/SimplePie/File.php';
-require ABSPATH . WPINC . '/SimplePie/Sanitize.php';
-require ABSPATH . WPINC . '/SimplePie/Registry.php';
-require ABSPATH . WPINC . '/SimplePie/IRI.php';
-require ABSPATH . WPINC . '/SimplePie/Locator.php';
-require ABSPATH . WPINC . '/SimplePie/Content/Type/Sniffer.php';
-require ABSPATH . WPINC . '/SimplePie/XML/Declaration/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Parser.php';
-require ABSPATH . WPINC . '/SimplePie/Item.php';
-require ABSPATH . WPINC . '/SimplePie/Parse/Date.php';
-require ABSPATH . WPINC . '/SimplePie/Author.php';
+require ABSPATH.WPINC.'/SimplePie/Misc.php';
+require ABSPATH.WPINC.'/SimplePie/Cache.php';
+require ABSPATH.WPINC.'/SimplePie/File.php';
+require ABSPATH.WPINC.'/SimplePie/Sanitize.php';
+require ABSPATH.WPINC.'/SimplePie/Registry.php';
+require ABSPATH.WPINC.'/SimplePie/IRI.php';
+require ABSPATH.WPINC.'/SimplePie/Locator.php';
+require ABSPATH.WPINC.'/SimplePie/Content/Type/Sniffer.php';
+require ABSPATH.WPINC.'/SimplePie/XML/Declaration/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Parser.php';
+require ABSPATH.WPINC.'/SimplePie/Item.php';
+require ABSPATH.WPINC.'/SimplePie/Parse/Date.php';
+require ABSPATH.WPINC.'/SimplePie/Author.php';
 
 /**
  * WordPress autoloader for SimplePie.
  *
  * @since 3.5.0
  */
-function wp_simplepie_autoload( $class ) {
-	if ( 0 !== strpos( $class, 'SimplePie_' ) )
+function wp_simplepie_autoload($class) {
+	if (0 !== strpos($class, 'SimplePie_'))
 		return;
 
-	$file = ABSPATH . WPINC . '/' . str_replace( '_', '/', $class ) . '.php';
-	include( $file );
+	$file = ABSPATH.WPINC.'/'.str_replace('_', '/', $class).'.php';
+	include($file);
 }
 
 /**
  * We autoload classes we may not need.
  */
-spl_autoload_register( 'wp_simplepie_autoload' );
+spl_autoload_register('wp_simplepie_autoload');
 
 /**
  * SimplePie
@@ -102,12 +102,12 @@ 
  * SimplePie Useragent
  * @see SimplePie::set_useragent()
  */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
 
 /**
  * SimplePie Linkback
  */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 
 /**
  * No Autodiscovery
@@ -700,9 +700,9 @@ 
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || ! gc_enabled()) && ! ini_get('zend.ze1_compatibility_mode'))
 		{
-			if (!empty($this->data['items']))
+			if ( ! empty($this->data['items']))
 			{
 				foreach ($this->data['items'] as $item)
 				{
@@ -710,7 +710,7 @@ 
 				}
 				unset($item, $this->data['items']);
 			}
-			if (!empty($this->data['ordered_items']))
+			if ( ! empty($this->data['ordered_items']))
 			{
 				foreach ($this->data['ordered_items'] as $item)
 				{
@@ -777,7 +777,7 @@ 
 		if ($file instanceof SimplePie_File)
 		{
 			$this->feed_url = $file->url;
-			$this->file =& $file;
+			$this->file = & $file;
 			return true;
 		}
 		return false;
@@ -1212,7 +1212,7 @@ 
 	{
 		if ($page !== false)
 		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
 		}
 		else
 		{
@@ -1242,12 +1242,12 @@ 
 	public function init()
 	{
 		// Check absolute bare minimum requirements.
-		if (!extension_loaded('xml') || !extension_loaded('pcre'))
+		if ( ! extension_loaded('xml') || ! extension_loaded('pcre'))
 		{
 			return false;
 		}
 		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
-		elseif (!extension_loaded('xmlreader'))
+		elseif ( ! extension_loaded('xmlreader'))
 		{
 			static $xml_is_sane = null;
 			if ($xml_is_sane === null)
@@ -1257,7 +1257,7 @@ 
 				xml_parser_free($parser_check);
 				$xml_is_sane = isset($values[0]['value']);
 			}
-			if (!$xml_is_sane)
+			if ( ! $xml_is_sane)
 			{
 				return false;
 			}
@@ -1273,7 +1273,7 @@ 
 		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
 		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen);
 
-		if (!empty($this->multifeed_url))
+		if ( ! empty($this->multifeed_url))
 		{
 			$i = 0;
 			$success = 0;
@@ -1285,7 +1285,7 @@ 
 				$this->multifeed_objects[$i]->set_feed_url($url);
 				$single_success = $this->multifeed_objects[$i]->init();
 				$success |= $single_success;
-				if (!$single_success)
+				if ( ! $single_success)
 				{
 					$this->error[$i] = $this->multifeed_objects[$i]->error();
 				}
@@ -1385,7 +1385,7 @@ 
 				if ($parser->parse($utf8_data, 'UTF-8'))
 				{
 					$this->data = $parser->get_data();
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					if ( ! ($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
 					{
 						$this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
@@ -1399,7 +1399,7 @@ 
 					$this->data['build'] = SIMPLEPIE_BUILD;
 
 					// Cache the file if caching is enabled
-					if ($cache && !$cache->save($this))
+					if ($cache && ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1437,10 +1437,10 @@ 
 		{
 			// Load the Cache
 			$this->data = $cache->load();
-			if (!empty($this->data))
+			if ( ! empty($this->data))
 			{
 				// If the cache is for an outdated build of SimplePie
-				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
+				if ( ! isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
 				{
 					$cache->unlink();
 					$this->data = array();
@@ -1486,7 +1486,7 @@ 
 							$headers['if-none-match'] = $this->data['headers']['etag'];
 						}
 
-						$file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+						$file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen));
 
 						if ($file->success)
 						{
@@ -1517,11 +1517,11 @@ 
 			}
 		}
 		// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
-		if (!isset($file))
+		if ( ! isset($file))
 		{
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
 			{
-				$file =& $this->file;
+				$file = & $this->file;
 			}
 			else
 			{
@@ -1532,26 +1532,26 @@ 
 			}
 		}
 		// If the file connection has an error, set SimplePie::error to that and quit
-		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		if ( ! $file->success && ! ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
 		{
 			$this->error = $file->error;
-			return !empty($this->data);
+			return ! empty($this->data);
 		}
 
-		if (!$this->force_feed)
+		if ( ! $this->force_feed)
 		{
 			// Check if the supplied URL is a feed, if it isn't, look for it.
 			$locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds));
 
-			if (!$locate->is_feed($file))
+			if ( ! $locate->is_feed($file))
 			{
 				// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
 				unset($file);
 				try
 				{
-					if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
+					if ( ! ($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
 					{
-						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+						$this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or ".SIMPLEPIE_NAME." was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 						return false;
 					}
@@ -1566,7 +1566,7 @@ 
 				if ($cache)
 				{
 					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
-					if (!$cache->save($this))
+					if ( ! $cache->save($this))
 					{
 						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 					}
@@ -1641,12 +1641,12 @@ 
 	 */
 	public function handle_content_type($mime = 'text/html')
 	{
-		if (!headers_sent())
+		if ( ! headers_sent())
 		{
 			$header = "Content-type: $mime;";
 			if ($this->get_encoding())
 			{
-				$header .= ' charset=' . $this->get_encoding();
+				$header .= ' charset='.$this->get_encoding();
 			}
 			else
 			{
@@ -1684,7 +1684,7 @@ 
 	 */
 	public function get_type()
 	{
-		if (!isset($this->data['type']))
+		if ( ! isset($this->data['type']))
 		{
 			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
@@ -1972,7 +1972,7 @@ 
 	 */
 	public function get_base($element = array())
 	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		if ( ! ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && ! empty($element['xml_base_explicit']) && isset($element['xml_base']))
 		{
 			return $element['xml_base'];
 		}
@@ -2120,7 +2120,7 @@ 
 			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($categories))
+		if ( ! empty($categories))
 		{
 			return array_unique($categories);
 		}
@@ -2218,7 +2218,7 @@ 
 			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($authors))
+		if ( ! empty($authors))
 		{
 			return array_unique($authors);
 		}
@@ -2304,7 +2304,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -2362,7 +2362,7 @@ 
 	 */
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
@@ -2406,19 +2406,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -2860,9 +2860,9 @@ 
 	 */
 	public function get_items($start = 0, $end = 0)
 	{
-		if (!isset($this->data['items']))
+		if ( ! isset($this->data['items']))
 		{
-			if (!empty($this->multifeed_objects))
+			if ( ! empty($this->multifeed_objects))
 			{
 				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
 			}
@@ -2912,17 +2912,17 @@ 
 			}
 		}
 
-		if (!empty($this->data['items']))
+		if ( ! empty($this->data['items']))
 		{
 			// If we want to order it by date, check if all items have a date, and then sort it
 			if ($this->order_by_date && empty($this->multifeed_objects))
 			{
-				if (!isset($this->data['ordered_items']))
+				if ( ! isset($this->data['ordered_items']))
 				{
 					$do_sort = true;
 					foreach ($this->data['items'] as $item)
 					{
-						if (!$item->get_date('U'))
+						if ( ! $item->get_date('U'))
 						{
 							$do_sort = false;
 							break;
@@ -2982,7 +2982,7 @@ 
 
 		if (($url = $this->get_link()) !== null)
 		{
-			return 'http://g.etfv.co/' . urlencode($url);
+			return 'http://g.etfv.co/'.urlencode($url);
 		}
 
 		return false;
@@ -3063,7 +3063,7 @@ 
 			$do_sort = true;
 			foreach ($items as $item)
 			{
-				if (!$item->get_date('U'))
+				if ( ! $item->get_date('U'))
 				{
 					$do_sort = false;
 					break;

src/wp-includes/class-smtp.php

Doc Comments +1 added lines, -1 removed lines

@@ -879,7 +879,7 @@
      * Send raw data to the server.
      * @param string $data The data to send
      * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
+     * @return integer The number of bytes sent to the server or false on error
      */
     public function client_send($data)
     {

Spacing +48 added lines, -48 removed lines

@@ -205,7 +205,7 @@ 
             return;
         }
         //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+        if ( ! in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
             call_user_func($this->Debugoutput, $str, $this->do_debug);
             return;
         }
@@ -227,7 +227,7 @@ 
             default:
                 //Normalize line breaks
                 $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                echo gmdate('Y-m-d H:i:s')."\t".str_replace(
                     "\n",
                     "\n                   \t                  ",
                     trim($str)
@@ -274,7 +274,7 @@ 
             $socket_context = stream_context_create($options);
             //Suppress errors; connection failures are handled at a higher level
             $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
+                $host.":".$port,
                 $errno,
                 $errstr,
                 $timeout,
@@ -296,14 +296,14 @@ 
             );
         }
         // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
+        if ( ! is_resource($this->smtp_conn)) {
             $this->setError(
                 'Failed to connect to server',
                 $errno,
                 $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -322,7 +322,7 @@ 
         }
         // Get any announcement
         $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
         return true;
     }
 
@@ -333,11 +333,11 @@ 
      */
     public function startTLS()
     {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+        if ( ! $this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
             return false;
         }
         // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
+        if ( ! stream_socket_enable_crypto(
             $this->smtp_conn,
             true,
             STREAM_CRYPTO_METHOD_TLS_CLIENT
@@ -367,7 +367,7 @@ 
         $workstation = '',
         $OAuth = null
     ) {
-        if (!$this->server_caps) {
+        if ( ! $this->server_caps) {
             $this->setError('Authentication is not allowed before HELO/EHLO');
             return false;
         }
@@ -375,16 +375,16 @@ 
         if (array_key_exists('EHLO', $this->server_caps)) {
         // SMTP extensions are available. Let's try to find a proper authentication method
 
-            if (!array_key_exists('AUTH', $this->server_caps)) {
+            if ( ! array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
                 // 'at this stage' means that auth may be allowed after the stage changes
                 // e.g. after STARTTLS
                 return false;
             }
 
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
             self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
@@ -402,7 +402,7 @@ 
                 self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
             }
 
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+            if ( ! in_array($authtype, $this->server_caps['AUTH'])) {
                 $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
                 return false;
             }
@@ -412,13 +412,13 @@ 
         switch ($authtype) {
             case 'PLAIN':
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                if ( ! $this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                     return false;
                 }
                 // Send encoded username and password
-                if (!$this->sendCommand(
+                if ( ! $this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -427,26 +427,26 @@ 
                 break;
             case 'LOGIN':
                 // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                if ( ! $this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                     return false;
                 }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                if ( ! $this->sendCommand("Username", base64_encode($username), 334)) {
                     return false;
                 }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                if ( ! $this->sendCommand("Password", base64_encode($password), 235)) {
                     return false;
                 }
                 break;
             case 'CRAM-MD5':
                 // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                if ( ! $this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                     return false;
                 }
                 // Get the challenge
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
                 // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
+                $response = $username.' '.$this->hmac($challenge, $password);
 
                 // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
@@ -490,7 +490,7 @@ 
         $k_ipad = $key ^ $ipad;
         $k_opad = $key ^ $opad;
 
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+        return md5($k_opad.pack('H*', md5($k_ipad.$data)));
     }
 
     /**
@@ -551,7 +551,7 @@ 
     public function data($msg_data)
     {
         //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+        if ( ! $this->sendCommand('DATA', 'DATA', 354)) {
             return false;
         }
 
@@ -573,7 +573,7 @@ 
 
         $field = substr($lines[0], 0, strpos($lines[0], ':'));
         $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
+        if ( ! empty($field) && strpos($field, ' ') === false) {
             $in_headers = true;
         }
 
@@ -589,7 +589,7 @@ 
                 //so as to avoid breaking in the middle of a word
                 $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
                 //Deliberately matches both false and 0
-                if (!$pos) {
+                if ( ! $pos) {
                     //No nice break found, add a hard break
                     $pos = self::MAX_LINE_LENGTH - 1;
                     $lines_out[] = substr($line, 0, $pos);
@@ -602,7 +602,7 @@ 
                 }
                 //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
                 if ($in_headers) {
-                    $line = "\t" . $line;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -610,10 +610,10 @@ 
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
                 //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
+                if ( ! empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.'.$line_out;
                 }
-                $this->client_send($line_out . self::CRLF);
+                $this->client_send($line_out.self::CRLF);
             }
         }
 
@@ -640,7 +640,7 @@ 
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+        return (boolean) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -654,7 +654,7 @@ 
      */
     protected function sendHello($hello, $host)
     {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
         $this->helo_rply = $this->last_reply;
         if ($noerror) {
             $this->parseHelloFields($hello);
@@ -682,8 +682,8 @@ 
                 continue;
             }
             $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
+            if ( ! empty($fields)) {
+                if ( ! $n) {
                     $name = $type;
                     $fields = $fields[0];
                 } else {
@@ -693,7 +693,7 @@ 
                             $fields = ($fields ? $fields[0] : 0);
                             break;
                         case 'AUTH':
-                            if (!is_array($fields)) {
+                            if ( ! is_array($fields)) {
                                 $fields = array();
                             }
                             break;
@@ -722,7 +722,7 @@ 
         $useVerp = ($this->do_verp ? ' XVERP' : '');
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -759,7 +759,7 @@ 
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $address . '>',
+            'RCPT TO:<'.$address.'>',
             array(250, 251)
         );
     }
@@ -786,7 +786,7 @@ 
      */
     protected function sendCommand($command, $commandstring, $expect)
     {
-        if (!$this->connected()) {
+        if ( ! $this->connected()) {
             $this->setError("Called $command without being connected");
             return false;
         }
@@ -795,7 +795,7 @@ 
             $this->setError("Command '$command' contained line breaks");
             return false;
         }
-        $this->client_send($commandstring . self::CRLF);
+        $this->client_send($commandstring.self::CRLF);
 
         $this->last_reply = $this->get_lines();
         // Fetch SMTP code and possible error code explanation
@@ -816,9 +816,9 @@ 
             $detail = substr($this->last_reply, 4);
         }
 
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
-        if (!in_array($code, (array)$expect)) {
+        if ( ! in_array($code, (array) $expect)) {
             $this->setError(
                 "$command command failed",
                 $detail,
@@ -826,7 +826,7 @@ 
                 $code_ex
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
                 self::DEBUG_CLIENT
             );
             return false;
@@ -888,7 +888,7 @@ 
     public function turn()
     {
         $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
         return false;
     }
 
@@ -945,13 +945,13 @@ 
      */
     public function getServerExt($name)
     {
-        if (!$this->server_caps) {
+        if ( ! $this->server_caps) {
             $this->setError('No HELO/EHLO was sent');
             return null;
         }
 
         // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
+        if ( ! array_key_exists($name, $this->server_caps)) {
             if ($name == 'HELO') {
                 return $this->server_caps['EHLO'];
             }
@@ -987,7 +987,7 @@ 
     protected function get_lines()
     {
         // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
+        if ( ! is_resource($this->smtp_conn)) {
             return '';
         }
         $data = '';
@@ -996,7 +996,7 @@ 
         if ($this->Timelimit > 0) {
             $endtime = time() + $this->Timelimit;
         }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+        while (is_resource($this->smtp_conn) && ! feof($this->smtp_conn)) {
             $str = @fgets($this->smtp_conn, 515);
             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
             $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
@@ -1009,7 +1009,7 @@ 
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1018,7 +1018,7 @@ 
             if ($endtime and time() > $endtime) {
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

Indentation +1077 added lines, -1077 removed lines

@@ -26,536 +26,536 @@ 
  */
 class SMTP
 {
-    /**
-     * The PHPMailer SMTP version number.
-     * @var string
-     */
-    const VERSION = '5.2.14';
-
-    /**
-     * SMTP line break constant.
-     * @var string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @var integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @var integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
-    /**
-     * The PHPMailer SMTP Version number.
-     * @var string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.14';
-
-    /**
-     * SMTP server port number.
-     * @var integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @var string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug output level.
-     * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
-     * * self::DEBUG_CLIENT (`1`) Client commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
-     * @var integer
-     */
-    public $do_debug = self::DEBUG_OFF;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @var string|callable
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to use VERP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @var boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * The timeout value for connection, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
-     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @var integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * How long to wait for commands to complete, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @var integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @var resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error information, if any, for the last SMTP command.
-     * @var array
-     */
-    protected $error = array(
-        'error' => '',
-        'detail' => '',
-        'smtp_code' => '',
-        'smtp_code_ex' => ''
-    );
-
-    /**
-     * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
-     * @var string|null
-     */
-    protected $helo_rply = null;
-
-    /**
-     * The set of SMTP extensions sent in reply to EHLO command.
-     * Indexes of the array are extension names.
-     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
-     * represents the server name. In case of HELO it is the only element of the array.
-     * Other values can be boolean TRUE or an array containing extension options.
-     * If null, no HELO/EHLO string has yet been received.
-     * @var array|null
-     */
-    protected $server_caps = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @var string
-     */
-    protected $last_reply = '';
-
-    /**
-     * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
-     * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
-     * @return void
-     */
-    protected function edebug($str, $level = 0)
-    {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
-        }
-    }
-
-    /**
-     * Connect to an SMTP server.
-     * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
-     * @param array $options An array of options for stream_context_create()
-     * @access public
-     * @return boolean
-     */
-    public function connect($host, $port = null, $timeout = 30, $options = array())
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
-        $this->setError('');
-        // Make sure we are __not__ connected
-        if ($this->connected()) {
-            // Already connected, generate error
-            $this->setError('Already connected to a server');
-            return false;
-        }
-        if (empty($port)) {
-            $port = self::DEFAULT_SMTP_PORT;
-        }
-        // Connect to the SMTP server
-        $this->edebug(
-            "Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
-            self::DEBUG_CONNECTION
-        );
-        $errno = 0;
-        $errstr = '';
-        if ($streamok) {
-            $socket_context = stream_context_create($options);
-            //Suppress errors; connection failures are handled at a higher level
-            $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
-                $errno,
-                $errstr,
-                $timeout,
-                STREAM_CLIENT_CONNECT,
-                $socket_context
-            );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
-            $this->setError(
-                'Failed to connect to server',
-                $errno,
-                $errstr
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // 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') {
-            $max = ini_get('max_execution_time');
-            // Don't bother if unlimited
-            if ($max != 0 && $timeout > $max) {
-                @set_time_limit($timeout);
-            }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
-        }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
-        return true;
-    }
-
-    /**
-     * Initiate a TLS (encrypted) session.
-     * @access public
-     * @return boolean
-     */
-    public function startTLS()
-    {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
-            return false;
-        }
-        // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
-            $this->smtp_conn,
-            true,
-            STREAM_CRYPTO_METHOD_TLS_CLIENT
-        )) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Perform SMTP authentication.
-     * Must be run after hello().
-     * @see hello()
-     * @param string $username The user name
-     * @param string $password The password
-     * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
-     * @param string $realm The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
-     * @return bool True if successfully authenticated.* @access public
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = null,
-        $realm = '',
-        $workstation = '',
-        $OAuth = null
-    ) {
-        if (!$this->server_caps) {
-            $this->setError('Authentication is not allowed before HELO/EHLO');
-            return false;
-        }
-
-        if (array_key_exists('EHLO', $this->server_caps)) {
-        // SMTP extensions are available. Let's try to find a proper authentication method
-
-            if (!array_key_exists('AUTH', $this->server_caps)) {
-                $this->setError('Authentication is not allowed at this stage');
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
-                return false;
-            }
-
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
-            self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
-                self::DEBUG_LOWLEVEL
-            );
-
-            if (empty($authtype)) {
-                foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) {
-                    if (in_array($method, $this->server_caps['AUTH'])) {
-                        $authtype = $method;
-                        break;
-                    }
-                }
-                if (empty($authtype)) {
-                    $this->setError('No supported authentication methods found');
-                    return false;
-                }
-                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
-            }
-
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
-                return false;
-            }
-        } elseif (empty($authtype)) {
-            $authtype = 'LOGIN';
-        }
-        switch ($authtype) {
-            case 'PLAIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
-                    return false;
-                }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
-                ) {
-                    return false;
-                }
-                break;
-            case 'LOGIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
-                    return false;
-                }
-                break;
-            case 'CRAM-MD5':
-                // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
-                    return false;
-                }
-                // Get the challenge
-                $challenge = base64_decode(substr($this->last_reply, 4));
-
-                // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
-
-                // send encoded credentials
-                return $this->sendCommand('Username', base64_encode($response), 235);
-            default:
-                $this->setError("Authentication method \"$authtype\" is not supported");
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * Calculate an MD5 HMAC hash.
-     * Works like hash_hmac('md5', $data, $key)
-     * in case that function is not available
-     * @param string $data The data to hash
-     * @param string $key  The key to hash with
-     * @access protected
-     * @return string
-     */
-    protected function hmac($data, $key)
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('md5', $data, $key);
-        }
-
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
-
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
-
-        $bytelen = 64; // byte length for md5
-        if (strlen($key) > $bytelen) {
-            $key = pack('H*', md5($key));
-        }
-        $key = str_pad($key, $bytelen, chr(0x00));
-        $ipad = str_pad('', $bytelen, chr(0x36));
-        $opad = str_pad('', $bytelen, chr(0x5c));
-        $k_ipad = $key ^ $ipad;
-        $k_opad = $key ^ $opad;
-
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
-    }
-
-    /**
-     * Check connection state.
-     * @access public
-     * @return boolean True if connected.
-     */
-    public function connected()
-    {
-        if (is_resource($this->smtp_conn)) {
-            $sock_status = stream_get_meta_data($this->smtp_conn);
-            if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
-                $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
-                    self::DEBUG_CLIENT
-                );
-                $this->close();
-                return false;
-            }
-            return true; // everything looks good
-        }
-        return false;
-    }
-
-    /**
-     * Close the socket and clean up the state of the class.
-     * Don't use this function without first trying to use QUIT.
-     * @see quit()
-     * @access public
-     * @return void
-     */
-    public function close()
-    {
-        $this->setError('');
-        $this->server_caps = null;
-        $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
-            fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
-        }
-    }
-
-    /**
-     * Send an SMTP DATA command.
-     * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
-     * and the message body being separated by and additional <CRLF>.
-     * Implements rfc 821: DATA <CRLF>
-     * @param string $msg_data Message data to send
-     * @access public
-     * @return boolean
-     */
-    public function data($msg_data)
-    {
-        //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
-            return false;
-        }
-
-        /* The server is ready to accept data!
+	/**
+	 * The PHPMailer SMTP version number.
+	 * @var string
+	 */
+	const VERSION = '5.2.14';
+
+	/**
+	 * SMTP line break constant.
+	 * @var string
+	 */
+	const CRLF = "\r\n";
+
+	/**
+	 * The SMTP port to use if one is not specified.
+	 * @var integer
+	 */
+	const DEFAULT_SMTP_PORT = 25;
+
+	/**
+	 * The maximum line length allowed by RFC 2822 section 2.1.1
+	 * @var integer
+	 */
+	const MAX_LINE_LENGTH = 998;
+
+	/**
+	 * Debug level for no output
+	 */
+	const DEBUG_OFF = 0;
+
+	/**
+	 * Debug level to show client -> server messages
+	 */
+	const DEBUG_CLIENT = 1;
+
+	/**
+	 * Debug level to show client -> server and server -> client messages
+	 */
+	const DEBUG_SERVER = 2;
+
+	/**
+	 * Debug level to show connection status, client -> server and server -> client messages
+	 */
+	const DEBUG_CONNECTION = 3;
+
+	/**
+	 * Debug level to show all messages
+	 */
+	const DEBUG_LOWLEVEL = 4;
+
+	/**
+	 * The PHPMailer SMTP Version number.
+	 * @var string
+	 * @deprecated Use the `VERSION` constant instead
+	 * @see SMTP::VERSION
+	 */
+	public $Version = '5.2.14';
+
+	/**
+	 * SMTP server port number.
+	 * @var integer
+	 * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+	 * @see SMTP::DEFAULT_SMTP_PORT
+	 */
+	public $SMTP_PORT = 25;
+
+	/**
+	 * SMTP reply line ending.
+	 * @var string
+	 * @deprecated Use the `CRLF` constant instead
+	 * @see SMTP::CRLF
+	 */
+	public $CRLF = "\r\n";
+
+	/**
+	 * Debug output level.
+	 * Options:
+	 * * self::DEBUG_OFF (`0`) No debug output, default
+	 * * self::DEBUG_CLIENT (`1`) Client commands
+	 * * self::DEBUG_SERVER (`2`) Client commands and server responses
+	 * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+	 * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+	 * @var integer
+	 */
+	public $do_debug = self::DEBUG_OFF;
+
+	/**
+	 * How to handle debug output.
+	 * Options:
+	 * * `echo` Output plain-text as-is, appropriate for CLI
+	 * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+	 * * `error_log` Output to error log as configured in php.ini
+	 *
+	 * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+	 * <code>
+	 * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+	 * </code>
+	 * @var string|callable
+	 */
+	public $Debugoutput = 'echo';
+
+	/**
+	 * Whether to use VERP.
+	 * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+	 * @link http://www.postfix.org/VERP_README.html Info on VERP
+	 * @var boolean
+	 */
+	public $do_verp = false;
+
+	/**
+	 * The timeout value for connection, in seconds.
+	 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+	 * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+	 * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+	 * @var integer
+	 */
+	public $Timeout = 300;
+
+	/**
+	 * How long to wait for commands to complete, in seconds.
+	 * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+	 * @var integer
+	 */
+	public $Timelimit = 300;
+
+	/**
+	 * The socket for the server connection.
+	 * @var resource
+	 */
+	protected $smtp_conn;
+
+	/**
+	 * Error information, if any, for the last SMTP command.
+	 * @var array
+	 */
+	protected $error = array(
+		'error' => '',
+		'detail' => '',
+		'smtp_code' => '',
+		'smtp_code_ex' => ''
+	);
+
+	/**
+	 * The reply the server sent to us for HELO.
+	 * If null, no HELO string has yet been received.
+	 * @var string|null
+	 */
+	protected $helo_rply = null;
+
+	/**
+	 * The set of SMTP extensions sent in reply to EHLO command.
+	 * Indexes of the array are extension names.
+	 * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+	 * represents the server name. In case of HELO it is the only element of the array.
+	 * Other values can be boolean TRUE or an array containing extension options.
+	 * If null, no HELO/EHLO string has yet been received.
+	 * @var array|null
+	 */
+	protected $server_caps = null;
+
+	/**
+	 * The most recent reply received from the server.
+	 * @var string
+	 */
+	protected $last_reply = '';
+
+	/**
+	 * Output debugging info via a user-selected method.
+	 * @see SMTP::$Debugoutput
+	 * @see SMTP::$do_debug
+	 * @param string $str Debug string to output
+	 * @param integer $level The debug level of this message; see DEBUG_* constants
+	 * @return void
+	 */
+	protected function edebug($str, $level = 0)
+	{
+		if ($level > $this->do_debug) {
+			return;
+		}
+		//Avoid clash with built-in function names
+		if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+			call_user_func($this->Debugoutput, $str, $this->do_debug);
+			return;
+		}
+		switch ($this->Debugoutput) {
+			case 'error_log':
+				//Don't output, just log
+				error_log($str);
+				break;
+			case 'html':
+				//Cleans up output a bit for a better looking, HTML-safe output
+				echo htmlentities(
+					preg_replace('/[\r\n]+/', '', $str),
+					ENT_QUOTES,
+					'UTF-8'
+				)
+				. "<br>\n";
+				break;
+			case 'echo':
+			default:
+				//Normalize line breaks
+				$str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+				echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+					"\n",
+					"\n                   \t                  ",
+					trim($str)
+				)."\n";
+		}
+	}
+
+	/**
+	 * Connect to an SMTP server.
+	 * @param string $host SMTP server IP or host name
+	 * @param integer $port The port number to connect to
+	 * @param integer $timeout How long to wait for the connection to open
+	 * @param array $options An array of options for stream_context_create()
+	 * @access public
+	 * @return boolean
+	 */
+	public function connect($host, $port = null, $timeout = 30, $options = array())
+	{
+		static $streamok;
+		//This is enabled by default since 5.0.0 but some providers disable it
+		//Check this once and cache the result
+		if (is_null($streamok)) {
+			$streamok = function_exists('stream_socket_client');
+		}
+		// Clear errors to avoid confusion
+		$this->setError('');
+		// Make sure we are __not__ connected
+		if ($this->connected()) {
+			// Already connected, generate error
+			$this->setError('Already connected to a server');
+			return false;
+		}
+		if (empty($port)) {
+			$port = self::DEFAULT_SMTP_PORT;
+		}
+		// Connect to the SMTP server
+		$this->edebug(
+			"Connection: opening to $host:$port, timeout=$timeout, options=".var_export($options, true),
+			self::DEBUG_CONNECTION
+		);
+		$errno = 0;
+		$errstr = '';
+		if ($streamok) {
+			$socket_context = stream_context_create($options);
+			//Suppress errors; connection failures are handled at a higher level
+			$this->smtp_conn = @stream_socket_client(
+				$host . ":" . $port,
+				$errno,
+				$errstr,
+				$timeout,
+				STREAM_CLIENT_CONNECT,
+				$socket_context
+			);
+		} else {
+			//Fall back to fsockopen which should work in more places, but is missing some features
+			$this->edebug(
+				"Connection: stream_socket_client not available, falling back to fsockopen",
+				self::DEBUG_CONNECTION
+			);
+			$this->smtp_conn = fsockopen(
+				$host,
+				$port,
+				$errno,
+				$errstr,
+				$timeout
+			);
+		}
+		// Verify we connected properly
+		if (!is_resource($this->smtp_conn)) {
+			$this->setError(
+				'Failed to connect to server',
+				$errno,
+				$errstr
+			);
+			$this->edebug(
+				'SMTP ERROR: ' . $this->error['error']
+				. ": $errstr ($errno)",
+				self::DEBUG_CLIENT
+			);
+			return false;
+		}
+		$this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+		// 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') {
+			$max = ini_get('max_execution_time');
+			// Don't bother if unlimited
+			if ($max != 0 && $timeout > $max) {
+				@set_time_limit($timeout);
+			}
+			stream_set_timeout($this->smtp_conn, $timeout, 0);
+		}
+		// Get any announcement
+		$announce = $this->get_lines();
+		$this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+		return true;
+	}
+
+	/**
+	 * Initiate a TLS (encrypted) session.
+	 * @access public
+	 * @return boolean
+	 */
+	public function startTLS()
+	{
+		if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+			return false;
+		}
+		// Begin encrypted connection
+		if (!stream_socket_enable_crypto(
+			$this->smtp_conn,
+			true,
+			STREAM_CRYPTO_METHOD_TLS_CLIENT
+		)) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Perform SMTP authentication.
+	 * Must be run after hello().
+	 * @see hello()
+	 * @param string $username The user name
+	 * @param string $password The password
+	 * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
+	 * @param string $realm The auth realm for NTLM
+	 * @param string $workstation The auth workstation for NTLM
+	 * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
+	 * @return bool True if successfully authenticated.* @access public
+	 */
+	public function authenticate(
+		$username,
+		$password,
+		$authtype = null,
+		$realm = '',
+		$workstation = '',
+		$OAuth = null
+	) {
+		if (!$this->server_caps) {
+			$this->setError('Authentication is not allowed before HELO/EHLO');
+			return false;
+		}
+
+		if (array_key_exists('EHLO', $this->server_caps)) {
+		// SMTP extensions are available. Let's try to find a proper authentication method
+
+			if (!array_key_exists('AUTH', $this->server_caps)) {
+				$this->setError('Authentication is not allowed at this stage');
+				// 'at this stage' means that auth may be allowed after the stage changes
+				// e.g. after STARTTLS
+				return false;
+			}
+
+			self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+			self::edebug(
+				'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+				self::DEBUG_LOWLEVEL
+			);
+
+			if (empty($authtype)) {
+				foreach (array('LOGIN', 'CRAM-MD5', 'PLAIN') as $method) {
+					if (in_array($method, $this->server_caps['AUTH'])) {
+						$authtype = $method;
+						break;
+					}
+				}
+				if (empty($authtype)) {
+					$this->setError('No supported authentication methods found');
+					return false;
+				}
+				self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
+			}
+
+			if (!in_array($authtype, $this->server_caps['AUTH'])) {
+				$this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+				return false;
+			}
+		} elseif (empty($authtype)) {
+			$authtype = 'LOGIN';
+		}
+		switch ($authtype) {
+			case 'PLAIN':
+				// Start authentication
+				if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+					return false;
+				}
+				// Send encoded username and password
+				if (!$this->sendCommand(
+					'User & Password',
+					base64_encode("\0" . $username . "\0" . $password),
+					235
+				)
+				) {
+					return false;
+				}
+				break;
+			case 'LOGIN':
+				// Start authentication
+				if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+					return false;
+				}
+				if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+					return false;
+				}
+				if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+					return false;
+				}
+				break;
+			case 'CRAM-MD5':
+				// Start authentication
+				if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+					return false;
+				}
+				// Get the challenge
+				$challenge = base64_decode(substr($this->last_reply, 4));
+
+				// Build the response
+				$response = $username . ' ' . $this->hmac($challenge, $password);
+
+				// send encoded credentials
+				return $this->sendCommand('Username', base64_encode($response), 235);
+			default:
+				$this->setError("Authentication method \"$authtype\" is not supported");
+				return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Calculate an MD5 HMAC hash.
+	 * Works like hash_hmac('md5', $data, $key)
+	 * in case that function is not available
+	 * @param string $data The data to hash
+	 * @param string $key  The key to hash with
+	 * @access protected
+	 * @return string
+	 */
+	protected function hmac($data, $key)
+	{
+		if (function_exists('hash_hmac')) {
+			return hash_hmac('md5', $data, $key);
+		}
+
+		// The following borrowed from
+		// http://php.net/manual/en/function.mhash.php#27225
+
+		// RFC 2104 HMAC implementation for php.
+		// Creates an md5 HMAC.
+		// Eliminates the need to install mhash to compute a HMAC
+		// by Lance Rushing
+
+		$bytelen = 64; // byte length for md5
+		if (strlen($key) > $bytelen) {
+			$key = pack('H*', md5($key));
+		}
+		$key = str_pad($key, $bytelen, chr(0x00));
+		$ipad = str_pad('', $bytelen, chr(0x36));
+		$opad = str_pad('', $bytelen, chr(0x5c));
+		$k_ipad = $key ^ $ipad;
+		$k_opad = $key ^ $opad;
+
+		return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+	}
+
+	/**
+	 * Check connection state.
+	 * @access public
+	 * @return boolean True if connected.
+	 */
+	public function connected()
+	{
+		if (is_resource($this->smtp_conn)) {
+			$sock_status = stream_get_meta_data($this->smtp_conn);
+			if ($sock_status['eof']) {
+				// The socket is valid but we are not connected
+				$this->edebug(
+					'SMTP NOTICE: EOF caught while checking if connected',
+					self::DEBUG_CLIENT
+				);
+				$this->close();
+				return false;
+			}
+			return true; // everything looks good
+		}
+		return false;
+	}
+
+	/**
+	 * Close the socket and clean up the state of the class.
+	 * Don't use this function without first trying to use QUIT.
+	 * @see quit()
+	 * @access public
+	 * @return void
+	 */
+	public function close()
+	{
+		$this->setError('');
+		$this->server_caps = null;
+		$this->helo_rply = null;
+		if (is_resource($this->smtp_conn)) {
+			// close the connection and cleanup
+			fclose($this->smtp_conn);
+			$this->smtp_conn = null; //Makes for cleaner serialization
+			$this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+		}
+	}
+
+	/**
+	 * Send an SMTP DATA command.
+	 * Issues a data command and sends the msg_data to the server,
+	 * finializing the mail transaction. $msg_data is the message
+	 * that is to be send with the headers. Each header needs to be
+	 * on a single line followed by a <CRLF> with the message headers
+	 * and the message body being separated by and additional <CRLF>.
+	 * Implements rfc 821: DATA <CRLF>
+	 * @param string $msg_data Message data to send
+	 * @access public
+	 * @return boolean
+	 */
+	public function data($msg_data)
+	{
+		//This will use the standard timelimit
+		if (!$this->sendCommand('DATA', 'DATA', 354)) {
+			return false;
+		}
+
+		/* The server is ready to accept data!
          * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
          * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
          * smaller lines to fit within the limit.
@@ -563,556 +563,556 @@ 
          * NOTE: this does not count towards line-length limit.
          */
 
-        // Normalize line breaks before exploding
-        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+		// Normalize line breaks before exploding
+		$lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
 
-        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+		/* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
          * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
          * process all lines before a blank line as headers.
          */
 
-        $field = substr($lines[0], 0, strpos($lines[0], ':'));
-        $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
-            $in_headers = true;
-        }
-
-        foreach ($lines as $line) {
-            $lines_out = array();
-            if ($in_headers and $line == '') {
-                $in_headers = false;
-            }
-            //Break this line up into several smaller lines if it's too long
-            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
-            while (isset($line[self::MAX_LINE_LENGTH])) {
-                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
-                //so as to avoid breaking in the middle of a word
-                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
-                //Deliberately matches both false and 0
-                if (!$pos) {
-                    //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
-                    $lines_out[] = substr($line, 0, $pos);
-                    $line = substr($line, $pos);
-                } else {
-                    //Break at the found point
-                    $lines_out[] = substr($line, 0, $pos);
-                    //Move along by the amount we dealt with
-                    $line = substr($line, $pos + 1);
-                }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
-                if ($in_headers) {
-                    $line = "\t" . $line;
-                }
-            }
-            $lines_out[] = $line;
-
-            //Send the lines to the server
-            foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
-                }
-                $this->client_send($line_out . self::CRLF);
-            }
-        }
-
-        //Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Used to identify the sending server to the receiving server.
-     * This makes sure that client and server are in a known state.
-     * Implements RFC 821: HELO <SP> <domain> <CRLF>
-     * and RFC 2821 EHLO.
-     * @param string $host The host name or IP to connect to
-     * @access public
-     * @return boolean
-     */
-    public function hello($host = '')
-    {
-        //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Low-level implementation used by hello()
-     * @see hello()
-     * @param string $hello The HELO string
-     * @param string $host The hostname to say we are
-     * @access protected
-     * @return boolean
-     */
-    protected function sendHello($hello, $host)
-    {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
-        $this->helo_rply = $this->last_reply;
-        if ($noerror) {
-            $this->parseHelloFields($hello);
-        } else {
-            $this->server_caps = null;
-        }
-        return $noerror;
-    }
-
-    /**
-     * Parse a reply to HELO/EHLO command to discover server extensions.
-     * In case of HELO, the only parameter that can be discovered is a server name.
-     * @access protected
-     * @param string $type - 'HELO' or 'EHLO'
-     */
-    protected function parseHelloFields($type)
-    {
-        $this->server_caps = array();
-        $lines = explode("\n", $this->last_reply);
-
-        foreach ($lines as $n => $s) {
-            //First 4 chars contain response code followed by - or space
-            $s = trim(substr($s, 4));
-            if (empty($s)) {
-                continue;
-            }
-            $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
-                    $name = $type;
-                    $fields = $fields[0];
-                } else {
-                    $name = array_shift($fields);
-                    switch ($name) {
-                        case 'SIZE':
-                            $fields = ($fields ? $fields[0] : 0);
-                            break;
-                        case 'AUTH':
-                            if (!is_array($fields)) {
-                                $fields = array();
-                            }
-                            break;
-                        default:
-                            $fields = true;
-                    }
-                }
-                $this->server_caps[$name] = $fields;
-            }
-        }
-    }
-
-    /**
-     * Send an SMTP MAIL command.
-     * Starts a mail transaction from the email address specified in
-     * $from. Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command.
-     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from Source address of this message
-     * @access public
-     * @return boolean
-     */
-    public function mail($from)
-    {
-        $useVerp = ($this->do_verp ? ' XVERP' : '');
-        return $this->sendCommand(
-            'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
-            250
-        );
-    }
-
-    /**
-     * Send an SMTP QUIT command.
-     * Closes the socket if there is no error or the $close_on_error argument is true.
-     * Implements from rfc 821: QUIT <CRLF>
-     * @param boolean $close_on_error Should the connection close if an error occurs?
-     * @access public
-     * @return boolean
-     */
-    public function quit($close_on_error = true)
-    {
-        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
-        $err = $this->error; //Save any error
-        if ($noerror or $close_on_error) {
-            $this->close();
-            $this->error = $err; //Restore any error from the quit command
-        }
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP RCPT command.
-     * Sets the TO argument to $toaddr.
-     * Returns true if the recipient was accepted false if it was rejected.
-     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-     * @param string $address The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($address)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $address . '>',
-            array(250, 251)
-        );
-    }
-
-    /**
-     * Send an SMTP RSET command.
-     * Abort any transaction that is currently in progress.
-     * Implements rfc 821: RSET <CRLF>
-     * @access public
-     * @return boolean True on success.
-     */
-    public function reset()
-    {
-        return $this->sendCommand('RSET', 'RSET', 250);
-    }
-
-    /**
-     * Send a command to an SMTP server and check its return code.
-     * @param string $command The command name - not sent to the server
-     * @param string $commandstring The actual command to send
-     * @param integer|array $expect One or more expected integer success codes
-     * @access protected
-     * @return boolean True on success.
-     */
-    protected function sendCommand($command, $commandstring, $expect)
-    {
-        if (!$this->connected()) {
-            $this->setError("Called $command without being connected");
-            return false;
-        }
-        //Reject line breaks in all commands
-        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
-            $this->setError("Command '$command' contained line breaks");
-            return false;
-        }
-        $this->client_send($commandstring . self::CRLF);
-
-        $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
-        $matches = array();
-        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
-            $code = $matches[1];
-            $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
-            $detail = preg_replace(
-                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
-                '',
-                $this->last_reply
-            );
-        } else {
-            // Fall back to simple parsing if regex fails
-            $code = substr($this->last_reply, 0, 3);
-            $code_ex = null;
-            $detail = substr($this->last_reply, 4);
-        }
-
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        if (!in_array($code, (array)$expect)) {
-            $this->setError(
-                "$command command failed",
-                $detail,
-                $code,
-                $code_ex
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-
-        $this->setError('');
-        return true;
-    }
-
-    /**
-     * Send an SMTP SAML command.
-     * Starts a mail transaction from the email address specified in $from.
-     * Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command. This command
-     * will send the message to the users terminal if they are logged
-     * in and send them an email.
-     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from The address the message is from
-     * @access public
-     * @return boolean
-     */
-    public function sendAndMail($from)
-    {
-        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
-    }
-
-    /**
-     * Send an SMTP VRFY command.
-     * @param string $name The name to verify
-     * @access public
-     * @return boolean
-     */
-    public function verify($name)
-    {
-        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
-    }
-
-    /**
-     * Send an SMTP NOOP command.
-     * Used to keep keep-alives alive, doesn't actually do anything
-     * @access public
-     * @return boolean
-     */
-    public function noop()
-    {
-        return $this->sendCommand('NOOP', 'NOOP', 250);
-    }
-
-    /**
-     * Send an SMTP TURN command.
-     * This is an optional command for SMTP that this class does not support.
-     * This method is here to make the RFC821 Definition complete for this class
-     * and _may_ be implemented in future
-     * Implements from rfc 821: TURN <CRLF>
-     * @access public
-     * @return boolean
-     */
-    public function turn()
-    {
-        $this->setError('The SMTP TURN command is not implemented');
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
-        return false;
-    }
-
-    /**
-     * Send raw data to the server.
-     * @param string $data The data to send
-     * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
-     */
-    public function client_send($data)
-    {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
-    }
-
-    /**
-     * Get the latest error.
-     * @access public
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get SMTP extensions available on the server
-     * @access public
-     * @return array|null
-     */
-    public function getServerExtList()
-    {
-        return $this->server_caps;
-    }
-
-    /**
-     * A multipurpose method
-     * The method works in three ways, dependent on argument value and current state
-     *   1. HELO/EHLO was not sent - returns null and set up $this->error
-     *   2. HELO was sent
-     *     $name = 'HELO': returns server name
-     *     $name = 'EHLO': returns boolean false
-     *     $name = any string: returns null and set up $this->error
-     *   3. EHLO was sent
-     *     $name = 'HELO'|'EHLO': returns server name
-     *     $name = any string: if extension $name exists, returns boolean True
-     *       or its options. Otherwise returns boolean False
-     * In other words, one can use this method to detect 3 conditions:
-     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
-     *  - false returned: the requested feature exactly not exists
-     *  - positive value returned: the requested feature exists
-     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
-     * @return mixed
-     */
-    public function getServerExt($name)
-    {
-        if (!$this->server_caps) {
-            $this->setError('No HELO/EHLO was sent');
-            return null;
-        }
-
-        // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
-            if ($name == 'HELO') {
-                return $this->server_caps['EHLO'];
-            }
-            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
-                return false;
-            }
-            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
-            return null;
-        }
-
-        return $this->server_caps[$name];
-    }
-
-    /**
-     * Get the last reply from the server.
-     * @access public
-     * @return string
-     */
-    public function getLastReply()
-    {
-        return $this->last_reply;
-    }
-
-    /**
-     * Read the SMTP server's response.
-     * Either before eof or socket timeout occurs on the operation.
-     * With SMTP we can tell if we have more lines to read if the
-     * 4th character is '-' symbol. If it is a space then we don't
-     * need to read anything else.
-     * @access protected
-     * @return string
-     */
-    protected function get_lines()
-    {
-        // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
-            return '';
-        }
-        $data = '';
-        $endtime = 0;
-        stream_set_timeout($this->smtp_conn, $this->Timeout);
-        if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
-        }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-            $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
-                break;
-            }
-            // Timed-out? Log and break
-            $info = stream_get_meta_data($this->smtp_conn);
-            if ($info['timed_out']) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-            // Now check if reads took too long
-            if ($endtime and time() > $endtime) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enable or disable VERP address generation.
-     * @param boolean $enabled
-     */
-    public function setVerp($enabled = false)
-    {
-        $this->do_verp = $enabled;
-    }
-
-    /**
-     * Get VERP address generation mode.
-     * @return boolean
-     */
-    public function getVerp()
-    {
-        return $this->do_verp;
-    }
-
-    /**
-     * Set error messages and codes.
-     * @param string $message The error message
-     * @param string $detail Further detail on the error
-     * @param string $smtp_code An associated SMTP error code
-     * @param string $smtp_code_ex Extended SMTP code
-     */
-    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
-    {
-        $this->error = array(
-            'error' => $message,
-            'detail' => $detail,
-            'smtp_code' => $smtp_code,
-            'smtp_code_ex' => $smtp_code_ex
-        );
-    }
-
-    /**
-     * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
-     */
-    public function setDebugOutput($method = 'echo')
-    {
-        $this->Debugoutput = $method;
-    }
-
-    /**
-     * Get debug output method.
-     * @return string
-     */
-    public function getDebugOutput()
-    {
-        return $this->Debugoutput;
-    }
-
-    /**
-     * Set debug output level.
-     * @param integer $level
-     */
-    public function setDebugLevel($level = 0)
-    {
-        $this->do_debug = $level;
-    }
-
-    /**
-     * Get debug output level.
-     * @return integer
-     */
-    public function getDebugLevel()
-    {
-        return $this->do_debug;
-    }
-
-    /**
-     * Set SMTP timeout.
-     * @param integer $timeout
-     */
-    public function setTimeout($timeout = 0)
-    {
-        $this->Timeout = $timeout;
-    }
-
-    /**
-     * Get SMTP timeout.
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->Timeout;
-    }
+		$field = substr($lines[0], 0, strpos($lines[0], ':'));
+		$in_headers = false;
+		if (!empty($field) && strpos($field, ' ') === false) {
+			$in_headers = true;
+		}
+
+		foreach ($lines as $line) {
+			$lines_out = array();
+			if ($in_headers and $line == '') {
+				$in_headers = false;
+			}
+			//Break this line up into several smaller lines if it's too long
+			//Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+			while (isset($line[self::MAX_LINE_LENGTH])) {
+				//Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+				//so as to avoid breaking in the middle of a word
+				$pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+				//Deliberately matches both false and 0
+				if (!$pos) {
+					//No nice break found, add a hard break
+					$pos = self::MAX_LINE_LENGTH - 1;
+					$lines_out[] = substr($line, 0, $pos);
+					$line = substr($line, $pos);
+				} else {
+					//Break at the found point
+					$lines_out[] = substr($line, 0, $pos);
+					//Move along by the amount we dealt with
+					$line = substr($line, $pos + 1);
+				}
+				//If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+				if ($in_headers) {
+					$line = "\t" . $line;
+				}
+			}
+			$lines_out[] = $line;
+
+			//Send the lines to the server
+			foreach ($lines_out as $line_out) {
+				//RFC2821 section 4.5.2
+				if (!empty($line_out) and $line_out[0] == '.') {
+					$line_out = '.' . $line_out;
+				}
+				$this->client_send($line_out . self::CRLF);
+			}
+		}
+
+		//Message data has been sent, complete the command
+		//Increase timelimit for end of DATA command
+		$savetimelimit = $this->Timelimit;
+		$this->Timelimit = $this->Timelimit * 2;
+		$result = $this->sendCommand('DATA END', '.', 250);
+		//Restore timelimit
+		$this->Timelimit = $savetimelimit;
+		return $result;
+	}
+
+	/**
+	 * Send an SMTP HELO or EHLO command.
+	 * Used to identify the sending server to the receiving server.
+	 * This makes sure that client and server are in a known state.
+	 * Implements RFC 821: HELO <SP> <domain> <CRLF>
+	 * and RFC 2821 EHLO.
+	 * @param string $host The host name or IP to connect to
+	 * @access public
+	 * @return boolean
+	 */
+	public function hello($host = '')
+	{
+		//Try extended hello first (RFC 2821)
+		return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+	}
+
+	/**
+	 * Send an SMTP HELO or EHLO command.
+	 * Low-level implementation used by hello()
+	 * @see hello()
+	 * @param string $hello The HELO string
+	 * @param string $host The hostname to say we are
+	 * @access protected
+	 * @return boolean
+	 */
+	protected function sendHello($hello, $host)
+	{
+		$noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+		$this->helo_rply = $this->last_reply;
+		if ($noerror) {
+			$this->parseHelloFields($hello);
+		} else {
+			$this->server_caps = null;
+		}
+		return $noerror;
+	}
+
+	/**
+	 * Parse a reply to HELO/EHLO command to discover server extensions.
+	 * In case of HELO, the only parameter that can be discovered is a server name.
+	 * @access protected
+	 * @param string $type - 'HELO' or 'EHLO'
+	 */
+	protected function parseHelloFields($type)
+	{
+		$this->server_caps = array();
+		$lines = explode("\n", $this->last_reply);
+
+		foreach ($lines as $n => $s) {
+			//First 4 chars contain response code followed by - or space
+			$s = trim(substr($s, 4));
+			if (empty($s)) {
+				continue;
+			}
+			$fields = explode(' ', $s);
+			if (!empty($fields)) {
+				if (!$n) {
+					$name = $type;
+					$fields = $fields[0];
+				} else {
+					$name = array_shift($fields);
+					switch ($name) {
+						case 'SIZE':
+							$fields = ($fields ? $fields[0] : 0);
+							break;
+						case 'AUTH':
+							if (!is_array($fields)) {
+								$fields = array();
+							}
+							break;
+						default:
+							$fields = true;
+					}
+				}
+				$this->server_caps[$name] = $fields;
+			}
+		}
+	}
+
+	/**
+	 * Send an SMTP MAIL command.
+	 * Starts a mail transaction from the email address specified in
+	 * $from. Returns true if successful or false otherwise. If True
+	 * the mail transaction is started and then one or more recipient
+	 * commands may be called followed by a data command.
+	 * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+	 * @param string $from Source address of this message
+	 * @access public
+	 * @return boolean
+	 */
+	public function mail($from)
+	{
+		$useVerp = ($this->do_verp ? ' XVERP' : '');
+		return $this->sendCommand(
+			'MAIL FROM',
+			'MAIL FROM:<' . $from . '>' . $useVerp,
+			250
+		);
+	}
+
+	/**
+	 * Send an SMTP QUIT command.
+	 * Closes the socket if there is no error or the $close_on_error argument is true.
+	 * Implements from rfc 821: QUIT <CRLF>
+	 * @param boolean $close_on_error Should the connection close if an error occurs?
+	 * @access public
+	 * @return boolean
+	 */
+	public function quit($close_on_error = true)
+	{
+		$noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+		$err = $this->error; //Save any error
+		if ($noerror or $close_on_error) {
+			$this->close();
+			$this->error = $err; //Restore any error from the quit command
+		}
+		return $noerror;
+	}
+
+	/**
+	 * Send an SMTP RCPT command.
+	 * Sets the TO argument to $toaddr.
+	 * Returns true if the recipient was accepted false if it was rejected.
+	 * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+	 * @param string $address The address the message is being sent to
+	 * @access public
+	 * @return boolean
+	 */
+	public function recipient($address)
+	{
+		return $this->sendCommand(
+			'RCPT TO',
+			'RCPT TO:<' . $address . '>',
+			array(250, 251)
+		);
+	}
+
+	/**
+	 * Send an SMTP RSET command.
+	 * Abort any transaction that is currently in progress.
+	 * Implements rfc 821: RSET <CRLF>
+	 * @access public
+	 * @return boolean True on success.
+	 */
+	public function reset()
+	{
+		return $this->sendCommand('RSET', 'RSET', 250);
+	}
+
+	/**
+	 * Send a command to an SMTP server and check its return code.
+	 * @param string $command The command name - not sent to the server
+	 * @param string $commandstring The actual command to send
+	 * @param integer|array $expect One or more expected integer success codes
+	 * @access protected
+	 * @return boolean True on success.
+	 */
+	protected function sendCommand($command, $commandstring, $expect)
+	{
+		if (!$this->connected()) {
+			$this->setError("Called $command without being connected");
+			return false;
+		}
+		//Reject line breaks in all commands
+		if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
+			$this->setError("Command '$command' contained line breaks");
+			return false;
+		}
+		$this->client_send($commandstring . self::CRLF);
+
+		$this->last_reply = $this->get_lines();
+		// Fetch SMTP code and possible error code explanation
+		$matches = array();
+		if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+			$code = $matches[1];
+			$code_ex = (count($matches) > 2 ? $matches[2] : null);
+			// Cut off error code from each response line
+			$detail = preg_replace(
+				"/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
+				'',
+				$this->last_reply
+			);
+		} else {
+			// Fall back to simple parsing if regex fails
+			$code = substr($this->last_reply, 0, 3);
+			$code_ex = null;
+			$detail = substr($this->last_reply, 4);
+		}
+
+		$this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+		if (!in_array($code, (array)$expect)) {
+			$this->setError(
+				"$command command failed",
+				$detail,
+				$code,
+				$code_ex
+			);
+			$this->edebug(
+				'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+				self::DEBUG_CLIENT
+			);
+			return false;
+		}
+
+		$this->setError('');
+		return true;
+	}
+
+	/**
+	 * Send an SMTP SAML command.
+	 * Starts a mail transaction from the email address specified in $from.
+	 * Returns true if successful or false otherwise. If True
+	 * the mail transaction is started and then one or more recipient
+	 * commands may be called followed by a data command. This command
+	 * will send the message to the users terminal if they are logged
+	 * in and send them an email.
+	 * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+	 * @param string $from The address the message is from
+	 * @access public
+	 * @return boolean
+	 */
+	public function sendAndMail($from)
+	{
+		return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+	}
+
+	/**
+	 * Send an SMTP VRFY command.
+	 * @param string $name The name to verify
+	 * @access public
+	 * @return boolean
+	 */
+	public function verify($name)
+	{
+		return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+	}
+
+	/**
+	 * Send an SMTP NOOP command.
+	 * Used to keep keep-alives alive, doesn't actually do anything
+	 * @access public
+	 * @return boolean
+	 */
+	public function noop()
+	{
+		return $this->sendCommand('NOOP', 'NOOP', 250);
+	}
+
+	/**
+	 * Send an SMTP TURN command.
+	 * This is an optional command for SMTP that this class does not support.
+	 * This method is here to make the RFC821 Definition complete for this class
+	 * and _may_ be implemented in future
+	 * Implements from rfc 821: TURN <CRLF>
+	 * @access public
+	 * @return boolean
+	 */
+	public function turn()
+	{
+		$this->setError('The SMTP TURN command is not implemented');
+		$this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+		return false;
+	}
+
+	/**
+	 * Send raw data to the server.
+	 * @param string $data The data to send
+	 * @access public
+	 * @return integer|boolean The number of bytes sent to the server or false on error
+	 */
+	public function client_send($data)
+	{
+		$this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+		return fwrite($this->smtp_conn, $data);
+	}
+
+	/**
+	 * Get the latest error.
+	 * @access public
+	 * @return array
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+	/**
+	 * Get SMTP extensions available on the server
+	 * @access public
+	 * @return array|null
+	 */
+	public function getServerExtList()
+	{
+		return $this->server_caps;
+	}
+
+	/**
+	 * A multipurpose method
+	 * The method works in three ways, dependent on argument value and current state
+	 *   1. HELO/EHLO was not sent - returns null and set up $this->error
+	 *   2. HELO was sent
+	 *     $name = 'HELO': returns server name
+	 *     $name = 'EHLO': returns boolean false
+	 *     $name = any string: returns null and set up $this->error
+	 *   3. EHLO was sent
+	 *     $name = 'HELO'|'EHLO': returns server name
+	 *     $name = any string: if extension $name exists, returns boolean True
+	 *       or its options. Otherwise returns boolean False
+	 * In other words, one can use this method to detect 3 conditions:
+	 *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+	 *  - false returned: the requested feature exactly not exists
+	 *  - positive value returned: the requested feature exists
+	 * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+	 * @return mixed
+	 */
+	public function getServerExt($name)
+	{
+		if (!$this->server_caps) {
+			$this->setError('No HELO/EHLO was sent');
+			return null;
+		}
+
+		// the tight logic knot ;)
+		if (!array_key_exists($name, $this->server_caps)) {
+			if ($name == 'HELO') {
+				return $this->server_caps['EHLO'];
+			}
+			if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+				return false;
+			}
+			$this->setError('HELO handshake was used. Client knows nothing about server extensions');
+			return null;
+		}
+
+		return $this->server_caps[$name];
+	}
+
+	/**
+	 * Get the last reply from the server.
+	 * @access public
+	 * @return string
+	 */
+	public function getLastReply()
+	{
+		return $this->last_reply;
+	}
+
+	/**
+	 * Read the SMTP server's response.
+	 * Either before eof or socket timeout occurs on the operation.
+	 * With SMTP we can tell if we have more lines to read if the
+	 * 4th character is '-' symbol. If it is a space then we don't
+	 * need to read anything else.
+	 * @access protected
+	 * @return string
+	 */
+	protected function get_lines()
+	{
+		// If the connection is bad, give up straight away
+		if (!is_resource($this->smtp_conn)) {
+			return '';
+		}
+		$data = '';
+		$endtime = 0;
+		stream_set_timeout($this->smtp_conn, $this->Timeout);
+		if ($this->Timelimit > 0) {
+			$endtime = time() + $this->Timelimit;
+		}
+		while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+			$str = @fgets($this->smtp_conn, 515);
+			$this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+			$this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
+			$data .= $str;
+			// If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
+			if ((isset($str[3]) and $str[3] == ' ')) {
+				break;
+			}
+			// Timed-out? Log and break
+			$info = stream_get_meta_data($this->smtp_conn);
+			if ($info['timed_out']) {
+				$this->edebug(
+					'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+					self::DEBUG_LOWLEVEL
+				);
+				break;
+			}
+			// Now check if reads took too long
+			if ($endtime and time() > $endtime) {
+				$this->edebug(
+					'SMTP -> get_lines(): timelimit reached ('.
+					$this->Timelimit . ' sec)',
+					self::DEBUG_LOWLEVEL
+				);
+				break;
+			}
+		}
+		return $data;
+	}
+
+	/**
+	 * Enable or disable VERP address generation.
+	 * @param boolean $enabled
+	 */
+	public function setVerp($enabled = false)
+	{
+		$this->do_verp = $enabled;
+	}
+
+	/**
+	 * Get VERP address generation mode.
+	 * @return boolean
+	 */
+	public function getVerp()
+	{
+		return $this->do_verp;
+	}
+
+	/**
+	 * Set error messages and codes.
+	 * @param string $message The error message
+	 * @param string $detail Further detail on the error
+	 * @param string $smtp_code An associated SMTP error code
+	 * @param string $smtp_code_ex Extended SMTP code
+	 */
+	protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+	{
+		$this->error = array(
+			'error' => $message,
+			'detail' => $detail,
+			'smtp_code' => $smtp_code,
+			'smtp_code_ex' => $smtp_code_ex
+		);
+	}
+
+	/**
+	 * Set debug output method.
+	 * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+	 */
+	public function setDebugOutput($method = 'echo')
+	{
+		$this->Debugoutput = $method;
+	}
+
+	/**
+	 * Get debug output method.
+	 * @return string
+	 */
+	public function getDebugOutput()
+	{
+		return $this->Debugoutput;
+	}
+
+	/**
+	 * Set debug output level.
+	 * @param integer $level
+	 */
+	public function setDebugLevel($level = 0)
+	{
+		$this->do_debug = $level;
+	}
+
+	/**
+	 * Get debug output level.
+	 * @return integer
+	 */
+	public function getDebugLevel()
+	{
+		return $this->do_debug;
+	}
+
+	/**
+	 * Set SMTP timeout.
+	 * @param integer $timeout
+	 */
+	public function setTimeout($timeout = 0)
+	{
+		$this->Timeout = $timeout;
+	}
+
+	/**
+	 * Get SMTP timeout.
+	 * @return integer
+	 */
+	public function getTimeout()
+	{
+		return $this->Timeout;
+	}
 }

src/wp-includes/class-snoopy.php

Doc Comments +10 added lines

@@ -781,6 +781,9 @@ 
 	Output:
 \*======================================================================*/
 
+	/**
+	 * @param string $http_method
+	 */
 	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		$cookie_headers = '';
@@ -944,6 +947,9 @@ 
 	Output:
 \*======================================================================*/
 
+	/**
+	 * @param string $http_method
+	 */
 	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
 		if($this->passcookies && $this->_redirectaddr)
@@ -1189,6 +1195,10 @@ 
 	Output:		post body
 \*======================================================================*/
 
+	/**
+	 * @param string $formvars
+	 * @param string $formfiles
+	 */
 	function _prepare_post_body($formvars, $formfiles)
 	{
 		settype($formvars, "array");

Indentation +11 added lines, -11 removed lines

@@ -205,8 +205,8 @@ 
 				if(!$this->curl_path)
 					return false;
 				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
-				        return false;
+					if (!is_executable($this->curl_path))
+						return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -364,8 +364,8 @@ 
 				if(!$this->curl_path)
 					return false;
 				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
-				        return false;
+					if (!is_executable($this->curl_path))
+						return false;
 				$this->host = $URI_PARTS["host"];
 				if(!empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
@@ -885,10 +885,10 @@ 
 
 			if(preg_match("|^HTTP/|",$currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+				if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
 				{
 					$this->status= $status[1];
-                }
+				}
 				$this->response_code = $currentHeader;
 			}
 
@@ -897,11 +897,11 @@ 
 
 		$results = '';
 		do {
-    		$_data = fread($fp, $this->maxlength);
-    		if (strlen($_data) == 0) {
-        		break;
-    		}
-    		$results .= $_data;
+			$_data = fread($fp, $this->maxlength);
+			if (strlen($_data) == 0) {
+				break;
+			}
+			$results .= $_data;
 		} while(true);
 
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))

Spacing +254 added lines, -254 removed lines

@@ -3,9 +3,9 @@ 
 /**
  * Deprecated. Use WP_HTTP (http.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/http.php' );
+_deprecated_file(basename(__FILE__), '3.0', WPINC.'/http.php');
 
-if ( ! class_exists( 'Snoopy', false ) ) :
+if ( ! class_exists('Snoopy', false)) :
 /*************************************************
 
 Snoopy - the PHP net client
@@ -41,54 +41,54 @@ 
 
 	/* user definable vars */
 
-	var $host			=	"www.php.net";		// host name we are connecting to
-	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
-	var $proxy_user		=	"";					// proxy user to use
-	var $proxy_pass		=	"";					// proxy password to use
+	var $host			= "www.php.net"; // host name we are connecting to
+	var $port			= 80; // port we are connecting to
+	var $proxy_host		= ""; // proxy host to use
+	var $proxy_port		= ""; // proxy port to use
+	var $proxy_user		= ""; // proxy user to use
+	var $proxy_pass		= ""; // proxy password to use
 
-	var $agent			=	"Snoopy v1.2.4";	// agent we masquerade as
-	var	$referer		=	"";					// referer info to pass
-	var $cookies		=	array();			// array of cookies to pass
+	var $agent = "Snoopy v1.2.4"; // agent we masquerade as
+	var	$referer		= ""; // referer info to pass
+	var $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	var	$rawheaders		=	array();			// array of raw headers to send
+	var	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	var $lastredirectaddr	=	"";				// contains address of last redirected address
-	var	$offsiteok		=	true;				// allows redirection off-site
-	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	var $expandlinks	=	true;				// expand links to fully qualified URLs.
+	var $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	var $lastredirectaddr = ""; // contains address of last redirected address
+	var	$offsiteok		= true; // allows redirection off-site
+	var $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	var $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// submitlinks(), and submittext()
-	var $passcookies	=	true;				// pass set cookies back through redirects
+	var $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
+	var	$user			= ""; // user for http authentication
+	var	$pass			= ""; // password for http authentication
 
 	// http accept types
-	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	var $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 
-	var $results		=	"";					// where the content is put
+	var $results		= ""; // where the content is put
 
-	var $error			=	"";					// error messages sent here
-	var	$response_code	=	"";					// response code returned from server
-	var	$headers		=	array();			// headers returned from server sent here
-	var	$maxlength		=	500000;				// max return data length (body)
-	var $read_timeout	=	0;					// timeout on read operations, in seconds
+	var $error = ""; // error messages sent here
+	var	$response_code = ""; // response code returned from server
+	var	$headers = array(); // headers returned from server sent here
+	var	$maxlength = 500000; // max return data length (body)
+	var $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	var $timed_out		=	false;				// if a read operation timed out
-	var	$status			=	0;					// http request status
+	var $timed_out = false; // if a read operation timed out
+	var	$status = 0; // http request status
 
-	var $temp_dir		=	"/tmp";				// temporary directory that the webserver
+	var $temp_dir = "/tmp"; // temporary directory that the webserver
 												// has permission to write to.
 												// under Windows, this should be C:\temp
 
-	var	$curl_path		=	"/usr/local/bin/curl";
+	var	$curl_path = "/usr/local/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -102,20 +102,20 @@ 
 
 	/**** Private variables ****/
 
-	var	$_maxlinelen	=	4096;				// max line length (headers)
+	var	$_maxlinelen	= 4096; // max line length (headers)
 
-	var $_httpmethod	=	"GET";				// default http request method
-	var $_httpversion	=	"HTTP/1.0";			// default http request version
-	var $_submit_method	=	"POST";				// default submit method
-	var $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	var $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	var $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	var $_redirectdepth	=	0;					// increments on an http redirect
-	var $_frameurls		= 	array();			// frame src urls
-	var $_framedepth	=	0;					// increments on frame depth
+	var $_httpmethod	= "GET"; // default http request method
+	var $_httpversion	= "HTTP/1.0"; // default http request version
+	var $_submit_method	= "POST"; // default submit method
+	var $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	var $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	var $_redirectaddr = false; // will be set if page fetched is a redirect
+	var $_redirectdepth	= 0; // increments on an http redirect
+	var $_frameurls		= array(); // frame src urls
+	var $_framedepth	= 0; // increments on frame depth
 
-	var $_isproxy		=	false;				// set if using a proxy server
-	var $_fp_timeout	=	30;					// timeout for socket connection
+	var $_isproxy = false; // set if using a proxy server
+	var $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -131,27 +131,27 @@ 
 
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -162,30 +162,30 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -202,18 +202,18 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -222,30 +222,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -258,7 +258,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -276,34 +276,34 @@ 
 	Output:		$this->results	the text output from the post
 \*======================================================================*/
 
-	function submit($URI, $formvars="", $formfiles="")
+	function submit($URI, $formvars = "", $formfiles = "")
 	{
 		unset($postdata);
 
 		$postdata = $this->_prepare_post_body($formvars, $formfiles);
 
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata);
+						$this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 					}
 					else
 					{
@@ -314,36 +314,36 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
-							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								if( strpos( $this->_redirectaddr, "?" ) > 0 )
+								$this->lastredirectaddr = $this->_redirectaddr;
+								if (strpos($this->_redirectaddr, "?") > 0)
 									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 								else
-									$this->submit($this->_redirectaddr,$formvars, $formfiles);
+									$this->submit($this->_redirectaddr, $formvars, $formfiles);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -361,15 +361,15 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
@@ -381,36 +381,36 @@ 
 					$this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
-						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							if( strpos( $this->_redirectaddr, "?" ) > 0 )
+							$this->lastredirectaddr = $this->_redirectaddr;
+							if (strpos($this->_redirectaddr, "?") > 0)
 								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 							else
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								$this->submit($this->_redirectaddr, $formvars, $formfiles);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -424,7 +424,7 @@ 
 
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -442,17 +442,17 @@ 
 	{
 		if ($this->fetch($URI))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
 			}
 			else
 				$this->results = $this->_striplinks($this->results);
 
-			if($this->expandlinks)
+			if ($this->expandlinks)
 				$this->results = $this->_expandlinks($this->results, $URI);
 			return true;
 		}
@@ -473,9 +473,9 @@ 
 		if ($this->fetch($URI))
 		{
 
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_stripform($this->results[$x]);
 			}
 			else
@@ -497,11 +497,11 @@ 
 
 	function fetchtext($URI)
 	{
-		if($this->fetch($URI))
+		if ($this->fetch($URI))
 		{
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striptext($this->results[$x]);
 			}
 			else
@@ -519,26 +519,26 @@ 
 	Output:		$this->results	an array of the links from the post
 \*======================================================================*/
 
-	function submitlinks($URI, $formvars="", $formfiles="")
+	function submitlinks($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striplinks($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -555,24 +555,24 @@ 
 
 	function submittext($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striptext($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striptext($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -624,20 +624,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
@@ -654,10 +654,10 @@ 
 
 	function _stripform($document)
 	{
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 
 		// return the links
 		return $match;
@@ -679,11 +679,11 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quot|#34|#034|#x22);'i",		// replace html entities
-						"'&(amp|#38|#038|#x26);'i",			// added hexadecimal values
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quot|#34|#034|#x22);'i", // replace html entities
+						"'&(amp|#38|#038|#x26);'i", // added hexadecimal values
 						"'&(lt|#60|#060|#x3c);'i",
 						"'&(gt|#62|#062|#x3e);'i",
 						"'&(nbsp|#160|#xa0);'i",
@@ -694,8 +694,8 @@ 
 						"'&(reg|#174);'i",
 						"'&(deg|#176);'i",
 						"'&(#39|#039|#x27);'",
-						"'&(euro|#8364);'i",				// europe
-						"'&a(uml|UML);'",					// german
+						"'&(euro|#8364);'i", // europe
+						"'&a(uml|UML);'", // german
 						"'&o(uml|UML);'",
 						"'&u(uml|UML);'",
 						"'&A(uml|UML);'",
@@ -703,7 +703,7 @@ 
 						"'&U(uml|UML);'",
 						"'&szlig;'i",
 						);
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -728,7 +728,7 @@ 
 							chr(0xDF), // ANSI &szlig;
 						);
 
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 
 		return $text;
 	}
@@ -741,32 +741,32 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	function _expandlinks($links,$URI)
+	function _expandlinks($links, $URI)
 	{
 
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
-		$match = preg_replace("|/$|","",$match);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
+		$match = preg_replace("|/$|", "", $match);
 		$match_part = parse_url($match);
 		$match_root =
 		$match_part["scheme"]."://".$match_part["host"];
 
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(\/)|i",
 							"|^(?!http://)(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 
-		$replace = array(	"",
+		$replace = array("",
 							$match_root."/",
 							$match."/",
 							"/",
 							"/"
 						);
 
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -781,63 +781,63 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
 		$cookie_headers = '';
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+		if ( ! empty($this->host) && ! isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port) && $this->port != 80)
+			if ( ! empty($this->port) && $this->port != 80)
 				$headers .= ":".$this->port;
 			$headers .= "\r\n";
 		}
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		//add proxy auth headers
-		if(!empty($this->proxy_user))
-			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		if ( ! empty($this->proxy_user))
+			$headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
 		$headers .= "\r\n";
@@ -847,34 +847,34 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 
-			if($currentHeader == "\r\n")
+			if ($currentHeader == "\r\n")
 				break;
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)[ ]+(.*)/i",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)[ ]+(.*)/i", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -883,11 +883,11 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }
 				$this->response_code = $currentHeader;
 			}
@@ -902,31 +902,31 @@ 
         		break;
     		}
     		$results .= $_data;
-		} while(true);
+		} while (true);
 
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -944,108 +944,108 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			if(!empty($this->port))
+		if ( ! empty($this->host))
+			if ( ! empty($this->port))
 				$headers[] = "Host: ".$this->host.":".$this->port;
 			else
 				$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
-		$headerfile = tempnam( $this->temp_dir, "sno" );
-		$cmdline_params = '-k -D ' . escapeshellarg( $headerfile );
+		$headerfile = tempnam($this->temp_dir, "sno");
+		$cmdline_params = '-k -D '.escapeshellarg($headerfile);
 
-		foreach ( $headers as $header ) {
-			$cmdline_params .= ' -H ' . escapeshellarg( $header );
+		foreach ($headers as $header) {
+			$cmdline_params .= ' -H '.escapeshellarg($header);
 		}
 
-		if ( ! empty( $body ) ) {
-			$cmdline_params .= ' -d ' . escapeshellarg( $body );
+		if ( ! empty($body)) {
+			$cmdline_params .= ' -d '.escapeshellarg($body);
 		}
 
-		if ( $this->read_timeout > 0 ) {
-			$cmdline_params .= ' -m ' . escapeshellarg( $this->read_timeout );
+		if ($this->read_timeout > 0) {
+			$cmdline_params .= ' -m '.escapeshellarg($this->read_timeout);
 		}
 
 
-		exec( $this->curl_path . ' ' . $cmdline_params . ' ' . escapeshellarg( $URI ), $results, $return );
+		exec($this->curl_path.' '.$cmdline_params.' '.escapeshellarg($URI), $results, $return);
 
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 
 
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 
 		$result_headers = file("$headerfile");
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)\s+(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)\s+(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -1054,7 +1054,7 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 				$this->response_code = $result_headers[$currentHeader];
 
 			$this->headers[] = $result_headers[$currentHeader];
@@ -1062,20 +1062,20 @@ 
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -1093,9 +1093,9 @@ 
 
 	function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
+		if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
 			$this->cookies[$match[1]] = urldecode($match[2]);
 		}
 	}
@@ -1127,7 +1127,7 @@ 
 
 	function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if ( ! empty($this->proxy_host) && ! empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 
@@ -1142,7 +1142,7 @@ 
 
 		$this->status = 0;
 
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -1158,16 +1158,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -1204,7 +1204,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -1218,7 +1218,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";
@@ -1236,7 +1236,7 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if ( ! is_readable($file_name)) continue;
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

Braces +273 added lines, -205 removed lines

@@ -131,29 +131,33 @@ 
 
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (empty($URI_PARTS["query"]))
-			$URI_PARTS["query"] = '';
-		if (empty($URI_PARTS["path"]))
-			$URI_PARTS["path"] = '';
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
+		if (empty($URI_PARTS["query"])) {
+					$URI_PARTS["query"] = '';
+		}
+		if (empty($URI_PARTS["path"])) {
+					$URI_PARTS["path"] = '';
+		}
 
 		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -189,33 +193,34 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					return false;
 				}
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
-					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if(!$this->curl_path) {
+									return false;
+				}
+				if(function_exists("is_executable")) {
+								    if (!is_executable($this->curl_path))
 				        return false;
+				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -249,9 +254,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}
 				return true;
@@ -283,29 +288,33 @@ 
 		$postdata = $this->_prepare_post_body($formvars, $formfiles);
 
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-		if (empty($URI_PARTS["query"]))
-			$URI_PARTS["query"] = '';
-		if (empty($URI_PARTS["path"]))
-			$URI_PARTS["path"] = '';
+		if (!empty($URI_PARTS["user"])) {
+					$this->user = $URI_PARTS["user"];
+		}
+		if (!empty($URI_PARTS["pass"])) {
+					$this->pass = $URI_PARTS["pass"];
+		}
+		if (empty($URI_PARTS["query"])) {
+					$URI_PARTS["query"] = '';
+		}
+		if (empty($URI_PARTS["path"])) {
+					$URI_PARTS["path"] = '';
+		}
 
 		switch(strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_connect($fp))
 				{
 					if($this->_isproxy)
 					{
 						// using proxy, send entire URI
 						$this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata);
-					}
-					else
+					} else
 					{
 						$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 						// no proxy, send only the path
@@ -319,8 +328,9 @@ 
 						/* url was redirected, check if we've hit the max depth */
 						if($this->maxredirs > $this->_redirectdepth)
 						{
-							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) {
+															$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							}
 
 							// only follow redirect if it's on this site, or offsiteok is true
 							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
@@ -328,10 +338,13 @@ 
 								/* follow the redirect */
 								$this->_redirectdepth++;
 								$this->lastredirectaddr=$this->_redirectaddr;
-								if( strpos( $this->_redirectaddr, "?" ) > 0 )
-									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-								else
-									$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								if( strpos( $this->_redirectaddr, "?" ) > 0 ) {
+																	$this->fetch($this->_redirectaddr);
+								}
+								// the redirect has changed the request method from post to get
+								else {
+																	$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								}
 							}
 						}
 					}
@@ -347,34 +360,35 @@ 
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
+							} else {
+															break;
 							}
-							else
-								break;
 						}
 					}
 
-				}
-				else
+				} else
 				{
 					return false;
 				}
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
-					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if(!$this->curl_path) {
+									return false;
+				}
+				if(function_exists("is_executable")) {
+								    if (!is_executable($this->curl_path))
 				        return false;
+				}
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
+				if(!empty($URI_PARTS["port"])) {
+									$this->port = $URI_PARTS["port"];
+				}
 				if($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
-				}
-				else
+				} else
 				{
 					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
 					// no proxy, send only the path
@@ -386,8 +400,9 @@ 
 					/* url was redirected, check if we've hit the max depth */
 					if($this->maxredirs > $this->_redirectdepth)
 					{
-						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr)) {
+													$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						}
 
 						// only follow redirect if it's on this site, or offsiteok is true
 						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
@@ -395,10 +410,13 @@ 
 							/* follow the redirect */
 							$this->_redirectdepth++;
 							$this->lastredirectaddr=$this->_redirectaddr;
-							if( strpos( $this->_redirectaddr, "?" ) > 0 )
-								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
-							else
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+							if( strpos( $this->_redirectaddr, "?" ) > 0 ) {
+															$this->fetch($this->_redirectaddr);
+							}
+							// the redirect has changed the request method from post to get
+							else {
+															$this->submit($this->_redirectaddr,$formvars, $formfiles);
+							}
 						}
 					}
 				}
@@ -414,9 +432,9 @@ 
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
+						} else {
+													break;
 						}
-						else
-							break;
 					}
 				}
 				return true;
@@ -442,22 +460,25 @@ 
 	{
 		if ($this->fetch($URI))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_striplinks($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_striplinks($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_striplinks($this->results);
 			}
-			else
-				$this->results = $this->_striplinks($this->results);
 
-			if($this->expandlinks)
-				$this->results = $this->_expandlinks($this->results, $URI);
+			if($this->expandlinks) {
+							$this->results = $this->_expandlinks($this->results, $URI);
+			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -475,16 +496,17 @@ 
 
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_stripform($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_stripform($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_stripform($this->results);
 			}
-			else
-				$this->results = $this->_stripform($this->results);
 
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 
@@ -501,15 +523,16 @@ 
 		{
 			if(is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
-					$this->results[$x] = $this->_striptext($this->results[$x]);
+				for($x=0;$x<count($this->results);$x++) {
+									$this->results[$x] = $this->_striptext($this->results[$x]);
+				}
+			} else {
+							$this->results = $this->_striptext($this->results);
 			}
-			else
-				$this->results = $this->_striptext($this->results);
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -523,27 +546,29 @@ 
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
 				{
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if($this->expandlinks) {
+											$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->results = $this->_striplinks($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if($this->expandlinks) {
+									$this->results = $this->_expandlinks($this->results,$URI);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 /*======================================================================*\
@@ -557,27 +582,29 @@ 
 	{
 		if($this->submit($URI,$formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
-				$URI = $this->lastredirectaddr;
+			if($this->lastredirectaddr) {
+							$URI = $this->lastredirectaddr;
+			}
 			if(is_array($this->results))
 			{
 				for($x=0;$x<count($this->results);$x++)
 				{
 					$this->results[$x] = $this->_striptext($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if($this->expandlinks) {
+											$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					}
 				}
-			}
-			else
+			} else
 			{
 				$this->results = $this->_striptext($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if($this->expandlinks) {
+									$this->results = $this->_expandlinks($this->results,$URI);
+				}
 			}
 			return true;
+		} else {
+					return false;
 		}
-		else
-			return false;
 	}
 
 
@@ -631,14 +658,16 @@ 
 
 		while(list($key,$val) = each($links[2]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}
 
 		while(list($key,$val) = each($links[3]))
 		{
-			if(!empty($val))
-				$match[] = $val;
+			if(!empty($val)) {
+							$match[] = $val;
+			}
 		}
 
 		// return the links
@@ -784,29 +813,36 @@ 
 	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
 	{
 		$cookie_headers = '';
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
+		if(!empty($this->agent)) {
+					$headers .= "User-Agent: ".$this->agent."\r\n";
+		}
 		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port) && $this->port != 80)
-				$headers .= ":".$this->port;
+			if(!empty($this->port) && $this->port != 80) {
+							$headers .= ":".$this->port;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
+		if(!empty($this->accept)) {
+					$headers .= "Accept: ".$this->accept."\r\n";
+		}
+		if(!empty($this->referer)) {
+					$headers .= "Referer: ".$this->referer."\r\n";
+		}
 		if(!empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -819,32 +855,39 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers .= $headerKey.": ".$headerVal."\r\n";
+			}
 		}
 		if(!empty($content_type)) {
 			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
+			if ($content_type == "multipart/form-data") {
+							$headers .= "; boundary=".$this->_mime_boundary;
+			}
 			$headers .= "\r\n";
 		}
-		if(!empty($body))
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))
-			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
+		if(!empty($body)) {
+					$headers .= "Content-length: ".strlen($body)."\r\n";
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
+		}
 
 		//add proxy auth headers
-		if(!empty($this->proxy_user))
-			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		if(!empty($this->proxy_user)) {
+					$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		}
 
 
 		$headers .= "\r\n";
 
 		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
+		if ($this->read_timeout > 0) {
+					socket_set_timeout($fp, $this->read_timeout);
+		}
 		$this->timed_out = false;
 
 		fwrite($fp,$headers.$body,strlen($headers.$body));
@@ -860,8 +903,9 @@ 
 				return false;
 			}
 
-			if($currentHeader == "\r\n")
-				break;
+			if($currentHeader == "\r\n") {
+							break;
+			}
 
 			// if a header begins with Location: or URI:, set the redirect
 			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
@@ -874,13 +918,14 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 
 			if(preg_match("|^HTTP/|",$currentHeader))
@@ -922,15 +967,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		return true;
 	}
@@ -946,31 +994,38 @@ 
 
 	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
 	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
+		if($this->passcookies && $this->_redirectaddr) {
+					$this->setcookies();
+		}
 
 		$headers = array();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
+		if(empty($url)) {
+					$url = "/";
+		}
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			if(!empty($this->port))
+		if(!empty($this->agent)) {
+					$headers[] = "User-Agent: ".$this->agent;
+		}
+		if(!empty($this->host)) {
+					if(!empty($this->port))
 				$headers[] = "Host: ".$this->host.":".$this->port;
-			else
-				$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
+		} else {
+							$headers[] = "Host: ".$this->host;
+			}
+		if(!empty($this->accept)) {
+					$headers[] = "Accept: ".$this->accept;
+		}
+		if(!empty($this->referer)) {
+					$headers[] = "Referer: ".$this->referer;
+		}
 		if(!empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if(!is_array($this->cookies)) {
+							$this->cookies = (array)$this->cookies;
+			}
 
 			reset($this->cookies);
 			if ( count($this->cookies) > 0 ) {
@@ -983,21 +1038,26 @@ 
 		}
 		if(!empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
+			if(!is_array($this->rawheaders)) {
+							$this->rawheaders = (array)$this->rawheaders;
+			}
+			while(list($headerKey,$headerVal) = each($this->rawheaders)) {
+							$headers[] = $headerKey.": ".$headerVal;
+			}
 		}
 		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
+			if ($content_type == "multipart/form-data") {
+							$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
+			} else {
+							$headers[] = "Content-type: $content_type";
+			}
+		}
+		if(!empty($body)) {
+					$headers[] = "Content-length: ".strlen($body);
+		}
+		if(!empty($this->user) || !empty($this->pass)) {
+					$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 		}
-		if(!empty($body))
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
 		$headerfile = tempnam( $this->temp_dir, "sno" );
 		$cmdline_params = '-k -D ' . escapeshellarg( $headerfile );
@@ -1045,17 +1105,19 @@ 
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
+					if(!preg_match("|^/|",$matches[2])) {
+												$this->_redirectaddr .= "/".$matches[2];
+					} else {
+												$this->_redirectaddr .= $matches[2];
+					}
+				} else {
+									$this->_redirectaddr = $matches[2];
 				}
-				else
-					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-				$this->response_code = $result_headers[$currentHeader];
+			if(preg_match("|^HTTP/|",$result_headers[$currentHeader])) {
+							$this->response_code = $result_headers[$currentHeader];
+			}
 
 			$this->headers[] = $result_headers[$currentHeader];
 		}
@@ -1071,15 +1133,18 @@ 
 		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for($x=0; $x<count($match[1]); $x++) {
+							$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			}
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
+		elseif(is_array($this->results)) {
+					$this->results[] = $results;
+		}
 		// no framed content
-		else
-			$this->results = $results;
+		else {
+					$this->results = $results;
+		}
 
 		unlink("$headerfile");
 
@@ -1095,8 +1160,9 @@ 
 	{
 		for($x=0; $x<count($this->headers); $x++)
 		{
-		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
-			$this->cookies[$match[1]] = urldecode($match[2]);
+		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match)) {
+					$this->cookies[$match[1]] = urldecode($match[2]);
+		}
 		}
 	}
 
@@ -1133,8 +1199,7 @@ 
 
 				$host = $this->proxy_host;
 				$port = $this->proxy_port;
-			}
-		else
+			} else
 		{
 			$host = $this->host;
 			$port = $this->port;
@@ -1153,8 +1218,7 @@ 
 			// socket connection succeeded
 
 			return true;
-		}
-		else
+		} else
 		{
 			// socket connection failed
 			$this->status = $errno;
@@ -1198,8 +1262,9 @@ 
 		settype($formfiles, "array");
 		$postdata = '';
 
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
+		if (count($formvars) == 0 && count($formfiles) == 0) {
+					return;
+		}
 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
@@ -1209,8 +1274,9 @@ 
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
 						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
+					} else {
+											$postdata .= urlencode($key)."=".urlencode($val)."&";
+					}
 				}
 				break;
 
@@ -1236,7 +1302,9 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if (!is_readable($file_name)) {
+							continue;
+						}
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

src/wp-includes/class-wp-customize-nav-menus.php

Doc Comments +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * @since 4.3.0
 	 * @access public
 	 *
-	 * @param object $manager An instance of the WP_Customize_Manager class.
+	 * @param WP_Customize_Manager $manager An instance of the WP_Customize_Manager class.
 	 */
 	public function __construct( $manager ) {
 		$this->previewed_menus = array();
@@ -876,7 +876,7 @@ 
 	 *
 	 * @param string $nav_menu_content The HTML content for the navigation menu.
 	 * @param object $args             An object containing wp_nav_menu() arguments.
-	 * @return null
+	 * @return string
 	 */
 	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
 		if ( ! empty( $args->can_partial_refresh ) && ! empty( $args->instance_number ) ) {

Spacing +272 added lines, -272 removed lines

@@ -44,31 +44,31 @@ 
 	 *
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
-	public function __construct( $manager ) {
+	public function __construct($manager) {
 		$this->previewed_menus = array();
 		$this->manager         = $manager;
 
 		// Skip useless hooks when the user can't manage nav menus anyway.
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		add_filter( 'customize_refresh_nonces', array( $this, 'filter_nonces' ) );
-		add_action( 'wp_ajax_load-available-menu-items-customizer', array( $this, 'ajax_load_available_items' ) );
-		add_action( 'wp_ajax_search-available-menu-items-customizer', array( $this, 'ajax_search_available_items' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_filter('customize_refresh_nonces', array($this, 'filter_nonces'));
+		add_action('wp_ajax_load-available-menu-items-customizer', array($this, 'ajax_load_available_items'));
+		add_action('wp_ajax_search-available-menu-items-customizer', array($this, 'ajax_search_available_items'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_scripts'));
 
 		// Needs to run after core Navigation section is set up.
-		add_action( 'customize_register', array( $this, 'customize_register' ), 11 );
+		add_action('customize_register', array($this, 'customize_register'), 11);
 
-		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_dynamic_setting_args' ), 10, 2 );
-		add_filter( 'customize_dynamic_setting_class', array( $this, 'filter_dynamic_setting_class' ), 10, 3 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_templates' ) );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'available_items_template' ) );
-		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+		add_filter('customize_dynamic_setting_args', array($this, 'filter_dynamic_setting_args'), 10, 2);
+		add_filter('customize_dynamic_setting_class', array($this, 'filter_dynamic_setting_class'), 10, 3);
+		add_action('customize_controls_print_footer_scripts', array($this, 'print_templates'));
+		add_action('customize_controls_print_footer_scripts', array($this, 'available_items_template'));
+		add_action('customize_preview_init', array($this, 'customize_preview_init'));
 
 		// Selective Refresh partials.
-		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
+		add_filter('customize_dynamic_partial_args', array($this, 'customize_dynamic_partial_args'), 10, 2);
 	}
 
 	/**
@@ -80,8 +80,8 @@ 
 	 * @param array $nonces Array of nonces.
 	 * @return array $nonces Modified array of nonces.
 	 */
-	public function filter_nonces( $nonces ) {
-		$nonces['customize-menus'] = wp_create_nonce( 'customize-menus' );
+	public function filter_nonces($nonces) {
+		$nonces['customize-menus'] = wp_create_nonce('customize-menus');
 		return $nonces;
 	}
 
@@ -92,25 +92,25 @@ 
 	 * @access public
 	 */
 	public function ajax_load_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['type'] ) || empty( $_POST['object'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
+		if (empty($_POST['type']) || empty($_POST['object'])) {
+			wp_send_json_error('nav_menus_missing_type_or_object_parameter');
 		}
 
-		$type = sanitize_key( $_POST['type'] );
-		$object = sanitize_key( $_POST['object'] );
-		$page = empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] );
-		$items = $this->load_available_items_query( $type, $object, $page );
+		$type = sanitize_key($_POST['type']);
+		$object = sanitize_key($_POST['object']);
+		$page = empty($_POST['page']) ? 0 : absint($_POST['page']);
+		$items = $this->load_available_items_query($type, $object, $page);
 
-		if ( is_wp_error( $items ) ) {
-			wp_send_json_error( $items->get_error_code() );
+		if (is_wp_error($items)) {
+			wp_send_json_error($items->get_error_code());
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -126,62 +126,62 @@ 
 	 * @param int    $page   Optional. The page number used to generate the query offset. Default is '0'.
 	 * @return WP_Error|array Returns either a WP_Error object or an array of menu items.
 	 */
-	public function load_available_items_query( $type = 'post_type', $object = 'page', $page = 0 ) {
+	public function load_available_items_query($type = 'post_type', $object = 'page', $page = 0) {
 		$items = array();
 
-		if ( 'post_type' === $type ) {
-			$post_type = get_post_type_object( $object );
-			if ( ! $post_type ) {
-				return new WP_Error( 'nav_menus_invalid_post_type' );
+		if ('post_type' === $type) {
+			$post_type = get_post_type_object($object);
+			if ( ! $post_type) {
+				return new WP_Error('nav_menus_invalid_post_type');
 			}
 
-			if ( 0 === $page && 'page' === $object ) {
+			if (0 === $page && 'page' === $object) {
 				// Add "Home" link. Treat as a page, but switch to custom on add.
 				$items[] = array(
 					'id'         => 'home',
-					'title'      => _x( 'Home', 'nav menu home label' ),
+					'title'      => _x('Home', 'nav menu home label'),
 					'type'       => 'custom',
-					'type_label' => __( 'Custom Link' ),
+					'type_label' => __('Custom Link'),
 					'object'     => '',
 					'url'        => home_url(),
 				);
-			} elseif ( 'post' !== $object && 0 === $page && $post_type->has_archive ) {
+			} elseif ('post' !== $object && 0 === $page && $post_type->has_archive) {
 				// Add a post type archive link.
 				$items[] = array(
-					'id'         => $object . '-archive',
+					'id'         => $object.'-archive',
 					'title'      => $post_type->labels->archives,
 					'type'       => 'post_type_archive',
-					'type_label' => __( 'Post Type Archive' ),
+					'type_label' => __('Post Type Archive'),
 					'object'     => $object,
-					'url'        => get_post_type_archive_link( $object ),
+					'url'        => get_post_type_archive_link($object),
 				);
 			}
 
-			$posts = get_posts( array(
+			$posts = get_posts(array(
 				'numberposts' => 10,
 				'offset'      => 10 * $page,
 				'orderby'     => 'date',
 				'order'       => 'DESC',
 				'post_type'   => $object,
-			) );
-			foreach ( $posts as $post ) {
+			));
+			foreach ($posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
 					'id'         => "post-{$post->ID}",
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => get_post_type_object( $post->post_type )->labels->singular_name,
+					'type_label' => get_post_type_object($post->post_type)->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
-		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
+		} elseif ('taxonomy' === $type) {
+			$terms = get_terms($object, array(
 				'child_of'     => 0,
 				'exclude'      => '',
 				'hide_empty'   => false,
@@ -192,20 +192,20 @@ 
 				'order'        => 'DESC',
 				'orderby'      => 'count',
 				'pad_counts'   => false,
-			) );
-			if ( is_wp_error( $terms ) ) {
+			));
+			if (is_wp_error($terms)) {
 				return $terms;
 			}
 
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				$items[] = array(
 					'id'         => "term-{$term->term_id}",
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -220,7 +220,7 @@ 
 		 * @param string $object The object name.
 		 * @param int    $page   The current page number.
 		 */
-		$items = apply_filters( 'customize_nav_menu_available_items', $items, $type, $object, $page );
+		$items = apply_filters('customize_nav_menu_available_items', $items, $type, $object, $page);
 
 		return $items;
 	}
@@ -232,28 +232,28 @@ 
 	 * @access public
 	 */
 	public function ajax_search_available_items() {
-		check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
+		check_ajax_referer('customize-menus', 'customize-menus-nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_die( -1 );
 		}
 
-		if ( empty( $_POST['search'] ) ) {
-			wp_send_json_error( 'nav_menus_missing_search_parameter' );
+		if (empty($_POST['search'])) {
+			wp_send_json_error('nav_menus_missing_search_parameter');
 		}
 
-		$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
-		if ( $p < 1 ) {
+		$p = isset($_POST['page']) ? absint($_POST['page']) : 0;
+		if ($p < 1) {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s = sanitize_text_field(wp_unslash($_POST['search']));
+		$items = $this->search_available_items_query(array('pagenum' => $p, 's' => $s));
 
-		if ( empty( $items ) ) {
-			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
+		if (empty($items)) {
+			wp_send_json_error(array('message' => __('No results found.')));
 		} else {
-			wp_send_json_success( array( 'items' => $items ) );
+			wp_send_json_success(array('items' => $items));
 		}
 	}
 
@@ -268,12 +268,12 @@ 
 	 * @param array $args Optional. Accepts 'pagenum' and 's' (search) arguments.
 	 * @return array Menu items.
 	 */
-	public function search_available_items_query( $args = array() ) {
+	public function search_available_items_query($args = array()) {
 		$items = array();
 
-		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
+		$post_type_objects = get_post_types(array('show_in_nav_menus' => true), 'objects');
 		$query = array(
-			'post_type'              => array_keys( $post_type_objects ),
+			'post_type'              => array_keys($post_type_objects),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
@@ -281,55 +281,55 @@ 
 			'posts_per_page'         => 20,
 		);
 
-		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+		$args['pagenum'] = isset($args['pagenum']) ? absint($args['pagenum']) : 1;
+		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ($args['pagenum'] - 1) : 0;
 
-		if ( isset( $args['s'] ) ) {
+		if (isset($args['s'])) {
 			$query['s'] = $args['s'];
 		}
 
 		// Query posts.
-		$get_posts = new WP_Query( $query );
+		$get_posts = new WP_Query($query);
 
 		// Check if any posts were found.
-		if ( $get_posts->post_count ) {
-			foreach ( $get_posts->posts as $post ) {
+		if ($get_posts->post_count) {
+			foreach ($get_posts->posts as $post) {
 				$post_title = $post->post_title;
-				if ( '' === $post_title ) {
+				if ('' === $post_title) {
 					/* translators: %d: ID of a post */
-					$post_title = sprintf( __( '#%d (no title)' ), $post->ID );
+					$post_title = sprintf(__('#%d (no title)'), $post->ID);
 				}
 				$items[] = array(
-					'id'         => 'post-' . $post->ID,
-					'title'      => html_entity_decode( $post_title, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'post-'.$post->ID,
+					'title'      => html_entity_decode($post_title, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'post_type',
-					'type_label' => $post_type_objects[ $post->post_type ]->labels->singular_name,
+					'type_label' => $post_type_objects[$post->post_type]->labels->singular_name,
 					'object'     => $post->post_type,
-					'object_id'  => intval( $post->ID ),
-					'url'        => get_permalink( intval( $post->ID ) ),
+					'object_id'  => intval($post->ID),
+					'url'        => get_permalink(intval($post->ID)),
 				);
 			}
 		}
 
 		// Query taxonomy terms.
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'names');
+		$terms = get_terms($taxonomies, array(
 			'name__like' => $args['s'],
 			'number'     => 20,
 			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		));
 
 		// Check if any taxonomies were found.
-		if ( ! empty( $terms ) ) {
-			foreach ( $terms as $term ) {
+		if ( ! empty($terms)) {
+			foreach ($terms as $term) {
 				$items[] = array(
-					'id'         => 'term-' . $term->term_id,
-					'title'      => html_entity_decode( $term->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+					'id'         => 'term-'.$term->term_id,
+					'title'      => html_entity_decode($term->name, ENT_QUOTES, get_bloginfo('charset')),
 					'type'       => 'taxonomy',
-					'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
+					'type_label' => get_taxonomy($term->taxonomy)->labels->singular_name,
 					'object'     => $term->taxonomy,
-					'object_id'  => intval( $term->term_id ),
-					'url'        => get_term_link( intval( $term->term_id ), $term->taxonomy ),
+					'object_id'  => intval($term->term_id),
+					'url'        => get_term_link(intval($term->term_id), $term->taxonomy),
 				);
 			}
 		}
@@ -342,7 +342,7 @@ 
 		 * @param array $items The array of menu items.
 		 * @param array $args  Includes 'pagenum' and 's' (search) arguments.
 		 */
-		$items = apply_filters( 'customize_nav_menu_searched_items', $items, $args );
+		$items = apply_filters('customize_nav_menu_searched_items', $items, $args);
 
 		return $items;
 	}
@@ -354,44 +354,44 @@ 
 	 * @access public
 	 */
 	public function enqueue_scripts() {
-		wp_enqueue_style( 'customize-nav-menus' );
-		wp_enqueue_script( 'customize-nav-menus' );
+		wp_enqueue_style('customize-nav-menus');
+		wp_enqueue_script('customize-nav-menus');
 
-		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting( $this->manager, 'nav_menu[-1]' );
-		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting( $this->manager, 'nav_menu_item[-1]' );
+		$temp_nav_menu_setting      = new WP_Customize_Nav_Menu_Setting($this->manager, 'nav_menu[-1]');
+		$temp_nav_menu_item_setting = new WP_Customize_Nav_Menu_Item_Setting($this->manager, 'nav_menu_item[-1]');
 
 		// Pass data to JS.
 		$settings = array(
 			'allMenus'             => wp_get_nav_menus(),
 			'itemTypes'            => $this->available_item_types(),
 			'l10n'                 => array(
-				'untitled'          => _x( '(no label)', 'missing menu item navigation label' ),
-				'unnamed'           => _x( '(unnamed)', 'Missing menu name.' ),
-				'custom_label'      => __( 'Custom Link' ),
+				'untitled'          => _x('(no label)', 'missing menu item navigation label'),
+				'unnamed'           => _x('(unnamed)', 'Missing menu name.'),
+				'custom_label'      => __('Custom Link'),
 				/* translators: %s: menu location */
-				'menuLocation'      => _x( '(Currently set to: %s)', 'menu' ),
-				'menuNameLabel'     => __( 'Menu Name' ),
-				'itemAdded'         => __( 'Menu item added' ),
-				'itemDeleted'       => __( 'Menu item deleted' ),
-				'menuAdded'         => __( 'Menu created' ),
-				'menuDeleted'       => __( 'Menu deleted' ),
-				'movedUp'           => __( 'Menu item moved up' ),
-				'movedDown'         => __( 'Menu item moved down' ),
-				'movedLeft'         => __( 'Menu item moved out of submenu' ),
-				'movedRight'        => __( 'Menu item is now a sub-item' ),
+				'menuLocation'      => _x('(Currently set to: %s)', 'menu'),
+				'menuNameLabel'     => __('Menu Name'),
+				'itemAdded'         => __('Menu item added'),
+				'itemDeleted'       => __('Menu item deleted'),
+				'menuAdded'         => __('Menu created'),
+				'menuDeleted'       => __('Menu deleted'),
+				'movedUp'           => __('Menu item moved up'),
+				'movedDown'         => __('Menu item moved down'),
+				'movedLeft'         => __('Menu item moved out of submenu'),
+				'movedRight'        => __('Menu item is now a sub-item'),
 				/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-				'customizingMenus'  => sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) ),
+				'customizingMenus'  => sprintf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title)),
 				/* translators: %s: title of menu item which is invalid */
-				'invalidTitleTpl'   => __( '%s (Invalid)' ),
+				'invalidTitleTpl'   => __('%s (Invalid)'),
 				/* translators: %s: title of menu item in draft status */
-				'pendingTitleTpl'   => __( '%s (Pending)' ),
-				'itemsFound'        => __( 'Number of items found: %d' ),
-				'itemsFoundMore'    => __( 'Additional items found: %d' ),
-				'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
-				'reorderModeOn'     => __( 'Reorder mode enabled' ),
-				'reorderModeOff'    => __( 'Reorder mode closed' ),
-				'reorderLabelOn'    => esc_attr__( 'Reorder menu items' ),
-				'reorderLabelOff'   => esc_attr__( 'Close reorder mode' ),
+				'pendingTitleTpl'   => __('%s (Pending)'),
+				'itemsFound'        => __('Number of items found: %d'),
+				'itemsFoundMore'    => __('Additional items found: %d'),
+				'itemsLoadingMore'  => __('Loading more results... please wait.'),
+				'reorderModeOn'     => __('Reorder mode enabled'),
+				'reorderModeOff'    => __('Reorder mode closed'),
+				'reorderLabelOn'    => esc_attr__('Reorder menu items'),
+				'reorderLabelOff'   => esc_attr__('Close reorder mode'),
 			),
 			'settingTransport'     => 'postMessage',
 			'phpIntMax'            => PHP_INT_MAX,
@@ -402,29 +402,29 @@ 
 			'locationSlugMappedToName' => get_registered_nav_menus(),
 		);
 
-		$data = sprintf( 'var _wpCustomizeNavMenusSettings = %s;', wp_json_encode( $settings ) );
-		wp_scripts()->add_data( 'customize-nav-menus', 'data', $data );
+		$data = sprintf('var _wpCustomizeNavMenusSettings = %s;', wp_json_encode($settings));
+		wp_scripts()->add_data('customize-nav-menus', 'data', $data);
 
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'       => __('Move up one'),
+			'moveDown'     => __('Move down one'),
+			'moveToTop'    => __('Move to the top'),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'    => __('Move under %s'),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'  => __('Move out from under %s'),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'        => __('Under %s'),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'      => __('Out from under %s'),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 		);
-		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+		wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 	}
 
 	/**
@@ -441,13 +441,13 @@ 
 	 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 	 * @return array|false
 	 */
-	public function filter_dynamic_setting_args( $setting_args, $setting_id ) {
-		if ( preg_match( WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id ) ) {
+	public function filter_dynamic_setting_args($setting_args, $setting_id) {
+		if (preg_match(WP_Customize_Nav_Menu_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Setting::TYPE,
 				'transport' => 'postMessage',
 			);
-		} elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+		} elseif (preg_match(WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id)) {
 			$setting_args = array(
 				'type'      => WP_Customize_Nav_Menu_Item_Setting::TYPE,
 				'transport' => 'postMessage',
@@ -467,12 +467,12 @@ 
 	 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 	 * @return string
 	 */
-	public function filter_dynamic_setting_class( $setting_class, $setting_id, $setting_args ) {
-		unset( $setting_id );
+	public function filter_dynamic_setting_class($setting_class, $setting_id, $setting_args) {
+		unset($setting_id);
 
-		if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
+		if ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Setting';
-		} elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+		} elseif ( ! empty($setting_args['type']) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type']) {
 			$setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
 		}
 		return $setting_class;
@@ -487,145 +487,145 @@ 
 	public function customize_register() {
 
 		// Require JS-rendered control types.
-		$this->manager->register_panel_type( 'WP_Customize_Nav_Menus_Panel' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Name_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Auto_Add_Control' );
-		$this->manager->register_control_type( 'WP_Customize_Nav_Menu_Item_Control' );
+		$this->manager->register_panel_type('WP_Customize_Nav_Menus_Panel');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Name_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Auto_Add_Control');
+		$this->manager->register_control_type('WP_Customize_Nav_Menu_Item_Control');
 
 		// Create a panel for Menus.
-		$description = '<p>' . __( 'This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.' ) . '</p>';
-		if ( current_theme_supports( 'widgets' ) ) {
+		$description = '<p>'.__('This panel is used for managing navigation menus for content you have already published on your site. You can create menus and add items for existing content such as pages, posts, categories, tags, formats, or custom links.').'</p>';
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme or in <a href="%s">widget areas</a> by adding a &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		} else {
-			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
+			$description .= '<p>'.__('Menus can be displayed in locations defined by your theme.').'</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
+		$this->manager->add_panel(new WP_Customize_Nav_Menus_Panel($this->manager, 'nav_menus', array(
+			'title'       => __('Menus'),
 			'description' => $description,
 			'priority'    => 100,
 			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		)));
 		$menus = wp_get_nav_menus();
 
 		// Menu locations.
 		$locations     = get_registered_nav_menus();
-		$num_locations = count( array_keys( $locations ) );
-		if ( 1 == $num_locations ) {
-			$description = '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+		$num_locations = count(array_keys($locations));
+		if (1 == $num_locations) {
+			$description = '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
 			/* translators: %s: number of menu locations */
-			$description = '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			$description = '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
-		if ( current_theme_supports( 'widgets' ) ) {
+		if (current_theme_supports('widgets')) {
 			/* translators: URL to the widgets panel of the customizer */
-			$description .= '<p>' . sprintf( __( 'You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
+			$description .= '<p>'.sprintf(__('You can also place menus in <a href="%s">widget areas</a> with the &#8220;Custom Menu&#8221; widget.'), "javascript:wp.customize.panel( 'widgets' ).focus();").'</p>';
 		}
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => __( 'Menu Locations' ),
+		$this->manager->add_section('menu_locations', array(
+			'title'       => __('Menu Locations'),
 			'panel'       => 'nav_menus',
 			'priority'    => 5,
 			'description' => $description,
-		) );
+		));
 
-		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
-		foreach ( $menus as $menu ) {
-			$choices[ $menu->term_id ] = wp_html_excerpt( $menu->name, 40, '&hellip;' );
+		$choices = array('0' => __('&mdash; Select &mdash;'));
+		foreach ($menus as $menu) {
+			$choices[$menu->term_id] = wp_html_excerpt($menu->name, 40, '&hellip;');
 		}
 
-		foreach ( $locations as $location => $description ) {
+		foreach ($locations as $location => $description) {
 			$setting_id = "nav_menu_locations[{$location}]";
 
-			$setting = $this->manager->get_setting( $setting_id );
-			if ( $setting ) {
+			$setting = $this->manager->get_setting($setting_id);
+			if ($setting) {
 				$setting->transport = 'postMessage';
-				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
-				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
+				remove_filter("customize_sanitize_{$setting_id}", 'absint');
+				add_filter("customize_sanitize_{$setting_id}", array($this, 'intval_base10'));
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
+				$this->manager->add_setting($setting_id, array(
+					'sanitize_callback' => array($this, 'intval_base10'),
 					'theme_supports'    => 'menus',
 					'type'              => 'theme_mod',
 					'transport'         => 'postMessage',
 					'default'           => 0,
-				) );
+				));
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
+			$this->manager->add_control(new WP_Customize_Nav_Menu_Location_Control($this->manager, $setting_id, array(
 				'label'       => $description,
 				'location_id' => $location,
 				'section'     => 'menu_locations',
 				'choices'     => $choices,
-			) ) );
+			)));
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
-		foreach ( $menus as $menu ) {
+		foreach ($menus as $menu) {
 			$menu_id = $menu->term_id;
 
 			// Create a section for each menu.
-			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			$section_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_section(new WP_Customize_Nav_Menu_Section($this->manager, $section_id, array(
+				'title'     => html_entity_decode($menu->name, ENT_QUOTES, get_bloginfo('charset')),
 				'priority'  => 10,
 				'panel'     => 'nav_menus',
-			) ) );
+			)));
 
-			$nav_menu_setting_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_setting( new WP_Customize_Nav_Menu_Setting( $this->manager, $nav_menu_setting_id, array(
+			$nav_menu_setting_id = 'nav_menu['.$menu_id.']';
+			$this->manager->add_setting(new WP_Customize_Nav_Menu_Setting($this->manager, $nav_menu_setting_id, array(
 				'transport' => 'postMessage',
-			) ) );
+			)));
 
 			// Add the menu contents.
-			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
+			$menu_items = (array) wp_get_nav_menu_items($menu_id);
 
-			foreach ( array_values( $menu_items ) as $i => $item ) {
+			foreach (array_values($menu_items) as $i => $item) {
 
 				// Create a setting for each menu item (which doesn't actually manage data, currently).
-				$menu_item_setting_id = 'nav_menu_item[' . $item->ID . ']';
+				$menu_item_setting_id = 'nav_menu_item['.$item->ID.']';
 
 				$value = (array) $item;
 				$value['nav_menu_term_id'] = $menu_id;
-				$this->manager->add_setting( new WP_Customize_Nav_Menu_Item_Setting( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_setting(new WP_Customize_Nav_Menu_Item_Setting($this->manager, $menu_item_setting_id, array(
 					'value'     => $value,
 					'transport' => 'postMessage',
-				) ) );
+				)));
 
 				// Create a control for each menu item.
-				$this->manager->add_control( new WP_Customize_Nav_Menu_Item_Control( $this->manager, $menu_item_setting_id, array(
+				$this->manager->add_control(new WP_Customize_Nav_Menu_Item_Control($this->manager, $menu_item_setting_id, array(
 					'label'    => $item->title,
 					'section'  => $section_id,
 					'priority' => 10 + $i,
-				) ) );
+				)));
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( new WP_Customize_New_Menu_Section( $this->manager, 'add_menu', array(
-			'title'    => __( 'Add a Menu' ),
+		$this->manager->add_section(new WP_Customize_New_Menu_Section($this->manager, 'add_menu', array(
+			'title'    => __('Add a Menu'),
 			'panel'    => 'nav_menus',
 			'priority' => 999,
-		) ) );
+		)));
 
-		$this->manager->add_control( 'new_menu_name', array(
+		$this->manager->add_control('new_menu_name', array(
 			'label'       => '',
 			'section'     => 'add_menu',
 			'type'        => 'text',
 			'settings'    => array(),
 			'input_attrs' => array(
 				'class'       => 'menu-name-field',
-				'placeholder' => __( 'New menu name' ),
+				'placeholder' => __('New menu name'),
 			),
-		) );
+		));
 
-		$this->manager->add_control( new WP_Customize_New_Menu_Control( $this->manager, 'create_new_menu', array(
+		$this->manager->add_control(new WP_Customize_New_Menu_Control($this->manager, 'create_new_menu', array(
 			'section'  => 'add_menu',
 			'settings' => array(),
-		) ) );
+		)));
 	}
 
 	/**
@@ -640,8 +640,8 @@ 
 	 * @param mixed $value Number to convert.
 	 * @return int Integer.
 	 */
-	public function intval_base10( $value ) {
-		return intval( $value, 10 );
+	public function intval_base10($value) {
+		return intval($value, 10);
 	}
 
 	/**
@@ -655,9 +655,9 @@ 
 	public function available_item_types() {
 		$item_types = array();
 
-		$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $post_types ) {
-			foreach ( $post_types as $slug => $post_type ) {
+		$post_types = get_post_types(array('show_in_nav_menus' => true), 'objects');
+		if ($post_types) {
+			foreach ($post_types as $slug => $post_type) {
 				$item_types[] = array(
 					'title'  => $post_type->labels->name,
 					'type'   => 'post_type',
@@ -666,10 +666,10 @@ 
 			}
 		}
 
-		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'objects' );
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $slug => $taxonomy ) {
-				if ( 'post_format' === $taxonomy && ! current_theme_supports( 'post-formats' ) ) {
+		$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'objects');
+		if ($taxonomies) {
+			foreach ($taxonomies as $slug => $taxonomy) {
+				if ('post_format' === $taxonomy && ! current_theme_supports('post-formats')) {
 					continue;
 				}
 				$item_types[] = array(
@@ -687,7 +687,7 @@ 
 		 *
 		 * @param array $item_types Custom menu item types.
 		 */
-		$item_types = apply_filters( 'customize_nav_menu_available_item_types', $item_types );
+		$item_types = apply_filters('customize_nav_menu_available_item_types', $item_types);
 
 		return $item_types;
 	}
@@ -713,7 +713,7 @@ 
 						<button type="button" class="button-link item-add">
 							<span class="screen-reader-text"><?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
-								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
+								printf(__('Add to menu: %1$s (%2$s)'), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}');
 							?></span>
 						</button>
 					</div>
@@ -726,10 +726,10 @@ 
 				<?php
 				printf(
 					'<button type="button" class="menus-move-up">%1$s</button><button type="button" class="menus-move-down">%2$s</button><button type="button" class="menus-move-left">%3$s</button><button type="button" class="menus-move-right">%4$s</button>',
-					__( 'Move up' ),
-					__( 'Move down' ),
-					__( 'Move one level up' ),
-					__( 'Move one level down' )
+					__('Move up'),
+					__('Move down'),
+					__('Move one level up'),
+					__('Move one level down')
 				);
 				?>
 			</div>
@@ -748,49 +748,49 @@ 
 		<div id="available-menu-items" class="accordion-container">
 			<div class="customize-section-title">
 				<button type="button" class="customize-section-back" tabindex="-1">
-					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
+					<span class="screen-reader-text"><?php _e('Back'); ?></span>
 				</button>
 				<h3>
 					<span class="customize-action">
 						<?php
 							/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
-							printf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'nav_menus' )->title ) );
+							printf(__('Customizing &#9656; %s'), esc_html($this->manager->get_panel('nav_menus')->title));
 						?>
 					</span>
-					<?php _e( 'Add Menu Items' ); ?>
+					<?php _e('Add Menu Items'); ?>
 				</h3>
 			</div>
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
-					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
-					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
+					<label class="screen-reader-text" for="menu-items-search"><?php _e('Search Menu Items'); ?></label>
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e('Search menu items&hellip;') ?>" aria-describedby="menu-items-search-desc" />
+					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e('The search results will be updated as you type.'); ?></p>
 					<span class="spinner"></span>
 				</div>
-				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
+				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e('Clear Results'); ?></span></button>
 				<ul class="accordion-section-content" data-type="search"></ul>
 			</div>
 			<div id="new-custom-menu-item" class="accordion-section">
 				<h4 class="accordion-section-title" role="presentation">
-					<?php _e( 'Custom Links' ); ?>
+					<?php _e('Custom Links'); ?>
 					<button type="button" class="button-link" aria-expanded="false">
-						<span class="screen-reader-text"><?php _e( 'Toggle section: Custom Links' ); ?></span>
+						<span class="screen-reader-text"><?php _e('Toggle section: Custom Links'); ?></span>
 						<span class="toggle-indicator" aria-hidden="true"></span>
 					</button>
 				</h4>
 				<div class="accordion-section-content customlinkdiv">
 					<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
 					<p id="menu-item-url-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+						<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 						<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
 					</p>
 					<p id="menu-item-name-wrap" class="wp-clearfix">
-						<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+						<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 						<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
 					</p>
 					<p class="button-controls">
 						<span class="add-to-menu">
-							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
+							<input type="submit" class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="custom-menu-item-submit">
 							<span class="spinner"></span>
 						</span>
 					</p>
@@ -798,22 +798,22 @@ 
 			</div>
 			<?php
 			// Containers for per-post-type item browsing; items added with JS.
-			foreach ( $this->available_item_types() as $available_item_type ) {
-				$id = sprintf( 'available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object'] );
+			foreach ($this->available_item_types() as $available_item_type) {
+				$id = sprintf('available-menu-items-%s-%s', $available_item_type['type'], $available_item_type['object']);
 				?>
-				<div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
+				<div id="<?php echo esc_attr($id); ?>" class="accordion-section">
 					<h4 class="accordion-section-title" role="presentation">
-						<?php echo esc_html( $available_item_type['title'] ); ?>
+						<?php echo esc_html($available_item_type['title']); ?>
 						<span class="spinner"></span>
-						<span class="no-items"><?php _e( 'No items' ); ?></span>
+						<span class="no-items"><?php _e('No items'); ?></span>
 						<button type="button" class="button-link" aria-expanded="false">
 							<span class="screen-reader-text"><?php
 							/* translators: %s: Title of a section with menu items */
-							printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+							printf(__('Toggle section: %s'), esc_html($available_item_type['title'])); ?></span>
 							<span class="toggle-indicator" aria-hidden="true"></span>
 						</button>
 					</h4>
-					<ul class="accordion-section-content" data-type="<?php echo esc_attr( $available_item_type['type'] ); ?>" data-object="<?php echo esc_attr( $available_item_type['object'] ); ?>"></ul>
+					<ul class="accordion-section-content" data-type="<?php echo esc_attr($available_item_type['type']); ?>" data-object="<?php echo esc_attr($available_item_type['object']); ?>"></ul>
 				</div>
 				<?php
 			}
@@ -845,17 +845,17 @@ 
 	 * @param string      $partial_id   Partial ID.
 	 * @return array Partial args.
 	 */
-	public function customize_dynamic_partial_args( $partial_args, $partial_id ) {
+	public function customize_dynamic_partial_args($partial_args, $partial_id) {
 
-		if ( preg_match( '/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id ) ) {
-			if ( false === $partial_args ) {
+		if (preg_match('/^nav_menu_instance\[[0-9a-f]{32}\]$/', $partial_id)) {
+			if (false === $partial_args) {
 				$partial_args = array();
 			}
 			$partial_args = array_merge(
 				$partial_args,
 				array(
 					'type'                => 'nav_menu_instance',
-					'render_callback'     => array( $this, 'render_nav_menu_partial' ),
+					'render_callback'     => array($this, 'render_nav_menu_partial'),
 					'container_inclusive' => true,
 					'settings'            => array(), // Empty because the nav menu instance may relate to a menu or a location.
 					'capability'          => 'edit_theme_options',
@@ -873,11 +873,11 @@ 
 	 * @access public
 	 */
 	public function customize_preview_init() {
-		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue_deps' ) );
-		add_filter( 'wp_nav_menu_args', array( $this, 'filter_wp_nav_menu_args' ), 1000 );
-		add_filter( 'wp_nav_menu', array( $this, 'filter_wp_nav_menu' ), 10, 2 );
-		add_filter( 'wp_footer', array( $this, 'export_preview_data' ), 1 );
-		add_filter( 'customize_render_partials_response', array( $this, 'export_partial_rendered_nav_menu_instances' ) );
+		add_action('wp_enqueue_scripts', array($this, 'customize_preview_enqueue_deps'));
+		add_filter('wp_nav_menu_args', array($this, 'filter_wp_nav_menu_args'), 1000);
+		add_filter('wp_nav_menu', array($this, 'filter_wp_nav_menu'), 10, 2);
+		add_filter('wp_footer', array($this, 'export_preview_data'), 1);
+		add_filter('customize_render_partials_response', array($this, 'export_partial_rendered_nav_menu_instances'));
 	}
 
 	/**
@@ -891,7 +891,7 @@ 
 	 * @param array $args An array containing wp_nav_menu() arguments.
 	 * @return array Arguments.
 	 */
-	public function filter_wp_nav_menu_args( $args ) {
+	public function filter_wp_nav_menu_args($args) {
 		/*
 		 * The following conditions determine whether or not this instance of
 		 * wp_nav_menu() can use selective refreshed. A wp_nav_menu() can be
@@ -899,25 +899,25 @@ 
 		 */
 		$can_partial_refresh = (
 			// ...if wp_nav_menu() is directly echoing out the menu (and thus isn't manipulating the string after generated),
-			! empty( $args['echo'] )
+			! empty($args['echo'])
 			&&
 			// ...and if the fallback_cb can be serialized to JSON, since it will be included in the placement context data,
-			( empty( $args['fallback_cb'] ) || is_string( $args['fallback_cb'] ) )
+			(empty($args['fallback_cb']) || is_string($args['fallback_cb']))
 			&&
 			// ...and if the walker can also be serialized to JSON, since it will be included in the placement context data as well,
-			( empty( $args['walker'] ) || is_string( $args['walker'] ) )
+			(empty($args['walker']) || is_string($args['walker']))
 			// ...and if it has a theme location assigned or an assigned menu to display,
 			&& (
-				! empty( $args['theme_location'] )
+				! empty($args['theme_location'])
 				||
-				( ! empty( $args['menu'] ) && ( is_numeric( $args['menu'] ) || is_object( $args['menu'] ) ) )
+				( ! empty($args['menu']) && (is_numeric($args['menu']) || is_object($args['menu'])))
 			)
 			&&
 			// ...and if the nav menu would be rendered with a wrapper container element (upon which to attach data-* attributes).
 			(
-				! empty( $args['container'] )
+				! empty($args['container'])
 				||
-				( isset( $args['items_wrap'] ) && '<' === substr( $args['items_wrap'], 0, 1 ) )
+				(isset($args['items_wrap']) && '<' === substr($args['items_wrap'], 0, 1))
 			)
 		);
 		$args['can_partial_refresh'] = $can_partial_refresh;
@@ -925,7 +925,7 @@ 
 		$exported_args = $args;
 
 		// Empty out args which may not be JSON-serializable.
-		if ( ! $can_partial_refresh ) {
+		if ( ! $can_partial_refresh) {
 			$exported_args['fallback_cb'] = '';
 			$exported_args['walker'] = '';
 		}
@@ -934,15 +934,15 @@ 
 		 * Replace object menu arg with a term_id menu arg, as this exports better
 		 * to JS and is easier to compare hashes.
 		 */
-		if ( ! empty( $exported_args['menu'] ) && is_object( $exported_args['menu'] ) ) {
+		if ( ! empty($exported_args['menu']) && is_object($exported_args['menu'])) {
 			$exported_args['menu'] = $exported_args['menu']->term_id;
 		}
 
-		ksort( $exported_args );
-		$exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
+		ksort($exported_args);
+		$exported_args['args_hmac'] = $this->hash_nav_menu_args($exported_args);
 
 		$args['customize_preview_nav_menus_args'] = $exported_args;
-		$this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
+		$this->preview_nav_menu_instance_args[$exported_args['args_hmac']] = $exported_args;
 		return $args;
 	}
 
@@ -960,12 +960,12 @@ 
 	 * @param object $args             An object containing wp_nav_menu() arguments.
 	 * @return null
 	 */
-	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
-		if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
-			$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
+	public function filter_wp_nav_menu($nav_menu_content, $args) {
+		if (isset($args->customize_preview_nav_menus_args['can_partial_refresh']) && $args->customize_preview_nav_menus_args['can_partial_refresh']) {
+			$attributes = sprintf(' data-customize-partial-id="%s"', esc_attr('nav_menu_instance['.$args->customize_preview_nav_menus_args['args_hmac'].']'));
 			$attributes .= ' data-customize-partial-type="nav_menu_instance"';
-			$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
-			$nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $nav_menu_content, 1 );
+			$attributes .= sprintf(' data-customize-partial-placement-context="%s"', esc_attr(wp_json_encode($args->customize_preview_nav_menus_args)));
+			$nav_menu_content = preg_replace('#^(<\w+)#', '$1 '.$attributes, $nav_menu_content, 1);
 		}
 		return $nav_menu_content;
 	}
@@ -982,8 +982,8 @@ 
 	 * @param array $args The arguments to hash.
 	 * @return string Hashed nav menu arguments.
 	 */
-	public function hash_nav_menu_args( $args ) {
-		return wp_hash( serialize( $args ) );
+	public function hash_nav_menu_args($args) {
+		return wp_hash(serialize($args));
 	}
 
 	/**
@@ -993,8 +993,8 @@ 
 	 * @access public
 	 */
 	public function customize_preview_enqueue_deps() {
-		wp_enqueue_script( 'customize-preview-nav-menus' ); // Note that we have overridden this.
-		wp_enqueue_style( 'customize-preview' );
+		wp_enqueue_script('customize-preview-nav-menus'); // Note that we have overridden this.
+		wp_enqueue_style('customize-preview');
 	}
 
 	/**
@@ -1009,7 +1009,7 @@ 
 		$exports = array(
 			'navMenuInstanceArgs' => $this->preview_nav_menu_instance_args,
 		);
-		printf( '<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode( $exports ) );
+		printf('<script>var _wpCustomizePreviewNavMenusExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -1021,7 +1021,7 @@ 
 	 * @param array $response Response.
 	 * @return array Response.
 	 */
-	public function export_partial_rendered_nav_menu_instances( $response ) {
+	public function export_partial_rendered_nav_menu_instances($response) {
 		$response['nav_menu_instance_args'] = $this->preview_nav_menu_instance_args;
 		return $response;
 	}
@@ -1038,25 +1038,25 @@ 
 	 * @param array                $nav_menu_args Nav menu args supplied as container context.
 	 * @return string|false
 	 */
-	public function render_nav_menu_partial( $partial, $nav_menu_args ) {
-		unset( $partial );
+	public function render_nav_menu_partial($partial, $nav_menu_args) {
+		unset($partial);
 
-		if ( ! isset( $nav_menu_args['args_hmac'] ) ) {
+		if ( ! isset($nav_menu_args['args_hmac'])) {
 			// Error: missing_args_hmac.
 			return false;
 		}
 
 		$nav_menu_args_hmac = $nav_menu_args['args_hmac'];
-		unset( $nav_menu_args['args_hmac'] );
+		unset($nav_menu_args['args_hmac']);
 
-		ksort( $nav_menu_args );
-		if ( ! hash_equals( $this->hash_nav_menu_args( $nav_menu_args ), $nav_menu_args_hmac ) ) {
+		ksort($nav_menu_args);
+		if ( ! hash_equals($this->hash_nav_menu_args($nav_menu_args), $nav_menu_args_hmac)) {
 			// Error: args_hmac_mismatch.
 			return false;
 		}
 
 		ob_start();
-		wp_nav_menu( $nav_menu_args );
+		wp_nav_menu($nav_menu_args);
 		$content = ob_get_clean();
 
 		return $content;

src/wp-includes/class-wp-image-editor.php

Doc Comments +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
 	 *
 	 * @param int $width
 	 * @param int $height
-	 * @return true
+	 * @return boolean
 	 */
 	protected function update_size( $width = null, $height = null ) {
 		$this->size = array(
@@ -213,7 +213,7 @@ 
 	 * @since 4.0.0
 	 * @access public
 	 *
-	 * @return int $quality Compression Quality. Range: [1,100]
+	 * @return boolean $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
 		if ( ! $this->quality ) {

Braces +22 added lines, -16 removed lines

@@ -313,8 +313,7 @@ 
 		if ( $filename ) {
 			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
 			$file_mime = $this->get_mime_type( $file_ext );
-		}
-		else {
+		} else {
 			// If no file specified, grab editor's current extension and mime-type.
 			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
 			$file_mime = $this->mime_type;
@@ -348,8 +347,9 @@ 
 			$info = pathinfo( $filename );
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
-				$ext = $info['extension'];
+			if ( isset( $info['extension'] ) ) {
+							$ext = $info['extension'];
+			}
 
 			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
 		}
@@ -370,8 +370,9 @@ 
 	 */
 	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
-			$suffix = $this->get_suffix();
+		if ( ! $suffix ) {
+					$suffix = $this->get_suffix();
+		}
 
 		$info = pathinfo( $this->file );
 		$dir  = $info['dirname'];
@@ -380,8 +381,9 @@ 
 		$name = wp_basename( $this->file, ".$ext" );
 		$new_ext = strtolower( $extension ? $extension : $ext );
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
-			$dir = $_dest_path;
+		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) ) {
+					$dir = $_dest_path;
+		}
 
 		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
 	}
@@ -395,8 +397,9 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
-			return false;
+		if ( ! $this->get_size() ) {
+					return false;
+		}
 
 		return "{$this->size['width']}x{$this->size['height']}";
 	}
@@ -427,8 +430,9 @@ 
 
 			$fp = fopen( $filename, 'w' );
 
-			if ( ! $fp )
-				return false;
+			if ( ! $fp ) {
+							return false;
+			}
 
 			fwrite( $fp, $contents );
 			fclose( $fp );
@@ -454,8 +458,9 @@ 
 	 * @return string|false
 	 */
 	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
-			return false;
+		if ( ! $extension ) {
+					return false;
+		}
 
 		$mime_types = wp_get_mime_types();
 		$extensions = array_keys( $mime_types );
@@ -484,8 +489,9 @@ 
 	protected static function get_extension( $mime_type = null ) {
 		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
 
-		if ( empty( $extensions[0] ) )
-			return false;
+		if ( empty( $extensions[0] ) ) {
+					return false;
+		}
 
 		return $extensions[0];
 	}

Spacing +63 added lines, -63 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param string $file Path to the file to load.
 	 */
-	public function __construct( $file ) {
+	public function __construct($file) {
 		$this->file = $file;
 	}
 
@@ -41,7 +41,7 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 		return false;
 	}
 
@@ -58,7 +58,7 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
+	public static function supports_mime_type($mime_type) {
 		return false;
 	}
 
@@ -84,7 +84,7 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	abstract public function save( $destfilename = null, $mime_type = null );
+	abstract public function save($destfilename = null, $mime_type = null);
 
 	/**
 	 * Resizes current image.
@@ -102,7 +102,7 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	abstract public function resize( $max_w, $max_h, $crop = false );
+	abstract public function resize($max_w, $max_h, $crop = false);
 
 	/**
 	 * Resize multiple images from a single source.
@@ -122,7 +122,7 @@ 
 	 * }
 	 * @return array An array of resized images metadata by size.
 	 */
-	abstract public function multi_resize( $sizes );
+	abstract public function multi_resize($sizes);
 
 	/**
 	 * Crops Image.
@@ -140,7 +140,7 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	abstract public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false );
+	abstract public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false);
 
 	/**
 	 * Rotates current image counter-clockwise by $angle.
@@ -152,7 +152,7 @@ 
 	 * @param float $angle
 	 * @return bool|WP_Error
 	 */
-	abstract public function rotate( $angle );
+	abstract public function rotate($angle);
 
 	/**
 	 * Flips current image.
@@ -165,7 +165,7 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return bool|WP_Error
 	 */
-	abstract public function flip( $horz, $vert );
+	abstract public function flip($horz, $vert);
 
 	/**
 	 * Streams current image to browser.
@@ -177,7 +177,7 @@ 
 	 * @param string $mime_type
 	 * @return bool|WP_Error
 	 */
-	abstract public function stream( $mime_type = null );
+	abstract public function stream($mime_type = null);
 
 	/**
 	 * Gets dimensions of image.
@@ -201,7 +201,7 @@ 
 	 * @param int $height
 	 * @return true
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$this->size = array(
 			'width' => (int) $width,
 			'height' => (int) $height
@@ -218,7 +218,7 @@ 
 	 * @return int $quality Compression Quality. Range: [1,100]
 	 */
 	public function get_quality() {
-		if ( ! $this->quality ) {
+		if ( ! $this->quality) {
 			$this->set_quality();
 		}
 
@@ -234,8 +234,8 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		if ( null === $quality ) {
+	public function set_quality($quality = null) {
+		if (null === $quality) {
 			/**
 			 * Filter the default image compression quality setting.
 			 *
@@ -249,9 +249,9 @@ 
 			 * @param int    $quality   Quality level between 1 (low) and 100 (high).
 			 * @param string $mime_type Image mime type.
 			 */
-			$quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
+			$quality = apply_filters('wp_editor_set_quality', $this->default_quality, $this->mime_type);
 
-			if ( 'image/jpeg' == $this->mime_type ) {
+			if ('image/jpeg' == $this->mime_type) {
 				/**
 				 * Filter the JPEG compression quality for backward-compatibility.
 				 *
@@ -268,24 +268,24 @@ 
 				 * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
 				 * @param string $context Context of the filter.
 				 */
-				$quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+				$quality = apply_filters('jpeg_quality', $quality, 'image_resize');
 			}
 
-			if ( $quality < 0 || $quality > 100 ) {
+			if ($quality < 0 || $quality > 100) {
 				$quality = $this->default_quality;
 			}
 		}
 
 		// Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
-		if ( 0 === $quality ) {
+		if (0 === $quality) {
 			$quality = 1;
 		}
 
-		if ( ( $quality >= 1 ) && ( $quality <= 100 ) ) {
+		if (($quality >= 1) && ($quality <= 100)) {
 			$this->quality = $quality;
 			return true;
 		} else {
-			return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+			return new WP_Error('invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].'));
 		}
 	}
 
@@ -304,34 +304,34 @@ 
 	 * @param string $mime_type
 	 * @return array { filename|null, extension, mime-type }
 	 */
-	protected function get_output_format( $filename = null, $mime_type = null ) {
+	protected function get_output_format($filename = null, $mime_type = null) {
 		$new_ext = null;
 
 		// By default, assume specified type takes priority
-		if ( $mime_type ) {
-			$new_ext = $this->get_extension( $mime_type );
+		if ($mime_type) {
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
-			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
-			$file_mime = $this->get_mime_type( $file_ext );
+		if ($filename) {
+			$file_ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+			$file_mime = $this->get_mime_type($file_ext);
 		}
 		else {
 			// If no file specified, grab editor's current extension and mime-type.
-			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+			$file_ext = strtolower(pathinfo($this->file, PATHINFO_EXTENSION));
 			$file_mime = $this->mime_type;
 		}
 
 		// Check to see if specified mime-type is the same as type implied by
 		// file extension.  If so, prefer extension from file.
-		if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
+		if ( ! $mime_type || ($file_mime == $mime_type)) {
 			$mime_type = $file_mime;
 			$new_ext = $file_ext;
 		}
 
 		// Double-check that the mime-type selected is supported by the editor.
 		// If not, choose a default instead.
-		if ( ! $this->supports_mime_type( $mime_type ) ) {
+		if ( ! $this->supports_mime_type($mime_type)) {
 			/**
 			 * Filter default mime type prior to getting the file extension.
 			 *
@@ -341,22 +341,22 @@ 
 			 *
 			 * @param string $mime_type Mime type string.
 			 */
-			$mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
-			$new_ext = $this->get_extension( $mime_type );
+			$mime_type = apply_filters('image_editor_default_mime_type', $this->default_mime_type);
+			$new_ext = $this->get_extension($mime_type);
 		}
 
-		if ( $filename ) {
+		if ($filename) {
 			$ext = '';
-			$info = pathinfo( $filename );
+			$info = pathinfo($filename);
 			$dir  = $info['dirname'];
 
-			if ( isset( $info['extension'] ) )
+			if (isset($info['extension']))
 				$ext = $info['extension'];
 
-			$filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
+			$filename = trailingslashit($dir).wp_basename($filename, ".$ext").".{$new_ext}";
 		}
 
-		return array( $filename, $new_ext, $mime_type );
+		return array($filename, $new_ext, $mime_type);
 	}
 
 	/**
@@ -370,22 +370,22 @@ 
 	 * @param string $extension
 	 * @return string filename
 	 */
-	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
+	public function generate_filename($suffix = null, $dest_path = null, $extension = null) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
+		if ( ! $suffix)
 			$suffix = $this->get_suffix();
 
-		$info = pathinfo( $this->file );
+		$info = pathinfo($this->file);
 		$dir  = $info['dirname'];
 		$ext  = $info['extension'];
 
-		$name = wp_basename( $this->file, ".$ext" );
-		$new_ext = strtolower( $extension ? $extension : $ext );
+		$name = wp_basename($this->file, ".$ext");
+		$new_ext = strtolower($extension ? $extension : $ext);
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
+		if ( ! is_null($dest_path) && $_dest_path = realpath($dest_path))
 			$dir = $_dest_path;
 
-		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
+		return trailingslashit($dir)."{$name}-{$suffix}.{$new_ext}";
 	}
 
 	/**
@@ -397,7 +397,7 @@ 
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
+		if ( ! $this->get_size())
 			return false;
 
 		return "{$this->size['width']}x{$this->size['height']}";
@@ -414,29 +414,29 @@ 
 	 * @param array $arguments
 	 * @return bool
 	 */
-	protected function make_image( $filename, $function, $arguments ) {
-		if ( $stream = wp_is_stream( $filename ) ) {
+	protected function make_image($filename, $function, $arguments) {
+		if ($stream = wp_is_stream($filename)) {
 			ob_start();
 		} else {
 			// The directory containing the original file may no longer exist when using a replication plugin.
-			wp_mkdir_p( dirname( $filename ) );
+			wp_mkdir_p(dirname($filename));
 		}
 
-		$result = call_user_func_array( $function, $arguments );
+		$result = call_user_func_array($function, $arguments);
 
-		if ( $result && $stream ) {
+		if ($result && $stream) {
 			$contents = ob_get_contents();
 
-			$fp = fopen( $filename, 'w' );
+			$fp = fopen($filename, 'w');
 
-			if ( ! $fp )
+			if ( ! $fp)
 				return false;
 
-			fwrite( $fp, $contents );
-			fclose( $fp );
+			fwrite($fp, $contents);
+			fclose($fp);
 		}
 
-		if ( $stream ) {
+		if ($stream) {
 			ob_end_clean();
 		}
 
@@ -455,15 +455,15 @@ 
 	 * @param string $extension
 	 * @return string|false
 	 */
-	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
+	protected static function get_mime_type($extension = null) {
+		if ( ! $extension)
 			return false;
 
 		$mime_types = wp_get_mime_types();
-		$extensions = array_keys( $mime_types );
+		$extensions = array_keys($mime_types);
 
-		foreach ( $extensions as $_extension ) {
-			if ( preg_match( "/{$extension}/i", $_extension ) ) {
+		foreach ($extensions as $_extension) {
+			if (preg_match("/{$extension}/i", $_extension)) {
 				return $mime_types[$_extension];
 			}
 		}
@@ -483,10 +483,10 @@ 
 	 * @param string $mime_type
 	 * @return string|false
 	 */
-	protected static function get_extension( $mime_type = null ) {
-		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
+	protected static function get_extension($mime_type = null) {
+		$extensions = explode('|', array_search($mime_type, wp_get_mime_types()));
 
-		if ( empty( $extensions[0] ) )
+		if (empty($extensions[0]))
 			return false;
 
 		return $extensions[0];

src/wp-includes/class-wp.php

Doc Comments +1 added lines, -1 removed lines

@@ -699,7 +699,7 @@
 	 * @access public
 	 *
 	 * @param string $subject subject
-	 * @param array  $matches data used for substitution
+	 * @param string[]  $matches data used for substitution
 	 * @return string
 	 */
 	public static function apply($subject, $matches) {

Indentation +16 added lines, -16 removed lines

@@ -610,22 +610,22 @@
  	}
 
  	/**
-	 * Set the Headers for 404, if nothing is found for requested URL.
-	 *
-	 * Issue a 404 if a request doesn't match any posts and doesn't match
-	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
-	 * issued, and if the request was not a search or the homepage.
-	 *
-	 * Otherwise, issue a 200.
-	 *
-	 * This sets headers after posts have been queried. handle_404() really means "handle status."
-	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
-	 * a 404 so that canonical redirection logic can kick in.
-	 *
-	 * @since 2.0.0
-     * @access public
-	 *
-	 * @global WP_Query $wp_query
+ 	 * Set the Headers for 404, if nothing is found for requested URL.
+ 	 *
+ 	 * Issue a 404 if a request doesn't match any posts and doesn't match
+ 	 * any object (e.g. an existing-but-empty category, tag, author) and a 404 was not already
+ 	 * issued, and if the request was not a search or the homepage.
+ 	 *
+ 	 * Otherwise, issue a 200.
+ 	 *
+ 	 * This sets headers after posts have been queried. handle_404() really means "handle status."
+ 	 * By inspecting the result of querying posts, seemingly successful requests can be switched to
+ 	 * a 404 so that canonical redirection logic can kick in.
+ 	 *
+ 	 * @since 2.0.0
+ 	 * @access public
+ 	 *
+ 	 * @global WP_Query $wp_query
  	 */
 	public function handle_404() {
 		global $wp_query;

Spacing +142 added lines, -143 removed lines

@@ -15,7 +15,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
+	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed');
 
 	/**
 	 * Private query variables.
@@ -26,7 +26,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $private_query_vars = array( 'offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title' );
+	public $private_query_vars = array('offset', 'posts_per_page', 'posts_per_archive_page', 'showposts', 'nopaging', 'post_type', 'post_status', 'category__in', 'category__not_in', 'category__and', 'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'tag_id', 'post_mime_type', 'perm', 'comments_per_page', 'post__in', 'post__not_in', 'post_parent', 'post_parent__in', 'post_parent__not_in', 'title');
 
 	/**
 	 * Extra query variables set by the user.
@@ -100,7 +100,7 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
+		if ( ! in_array($qv, $this->public_query_vars))
 			$this->public_query_vars[] = $qv;
 	}
 
@@ -112,8 +112,8 @@ 
 	 *
 	 * @param string $name Query variable name.
 	 */
-	public function remove_query_var( $name ) {
-		$this->public_query_vars = array_diff( $this->public_query_vars, array( $name ) );
+	public function remove_query_var($name) {
+		$this->public_query_vars = array_diff($this->public_query_vars, array($name));
 	}
 
 	/**
@@ -154,35 +154,35 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+		if ( ! apply_filters('do_parse_request', true, $this, $extra_query_vars))
 			return;
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
 
-		if ( is_array( $extra_query_vars ) ) {
+		if (is_array($extra_query_vars)) {
 			$this->extra_query_vars = & $extra_query_vars;
-		} elseif ( ! empty( $extra_query_vars ) ) {
-			parse_str( $extra_query_vars, $this->extra_query_vars );
+		} elseif ( ! empty($extra_query_vars)) {
+			parse_str($extra_query_vars, $this->extra_query_vars);
 		}
 		// Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 
-		if ( ! empty($rewrite) ) {
+		if ( ! empty($rewrite)) {
 			// If we match a rewrite rule, this will be cleared.
 			$error = '404';
 			$this->did_permalink = true;
 
-			$pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
-			list( $pathinfo ) = explode( '?', $pathinfo );
-			$pathinfo = str_replace( "%", "%25", $pathinfo );
+			$pathinfo = isset($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : '';
+			list($pathinfo) = explode('?', $pathinfo);
+			$pathinfo = str_replace("%", "%25", $pathinfo);
 
-			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
+			list($req_uri) = explode('?', $_SERVER['REQUEST_URI']);
 			$self = $_SERVER['PHP_SELF'];
-			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
-			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
+			$home_path = trim(parse_url(home_url(), PHP_URL_PATH), '/');
+			$home_path_regex = sprintf('|^%s|i', preg_quote($home_path, '|'));
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
@@ -190,22 +190,22 @@ 
 			// requested permalink.
 			$req_uri = str_replace($pathinfo, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
+			$req_uri = preg_replace($home_path_regex, '', $req_uri);
 			$req_uri = trim($req_uri, '/');
 			$pathinfo = trim($pathinfo, '/');
-			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
+			$pathinfo = preg_replace($home_path_regex, '', $pathinfo);
 			$pathinfo = trim($pathinfo, '/');
 			$self = trim($self, '/');
-			$self = preg_replace( $home_path_regex, '', $self );
+			$self = preg_replace($home_path_regex, '', $self);
 			$self = trim($self, '/');
 
 			// The requested permalink is in $pathinfo for path info requests and
 			//  $req_uri for other requests.
-			if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
+			if ( ! empty($pathinfo) && ! preg_match('|^.*'.$wp_rewrite->index.'$|', $pathinfo)) {
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
+				if ($req_uri == $wp_rewrite->index)
 					$req_uri = '';
 				$requested_path = $req_uri;
 			}
@@ -215,32 +215,32 @@ 
 
 			// Look for matches.
 			$request_match = $requested_path;
-			if ( empty( $request_match ) ) {
+			if (empty($request_match)) {
 				// An empty request could only match against ^$ regex
-				if ( isset( $rewrite['$'] ) ) {
+				if (isset($rewrite['$'])) {
 					$this->matched_rule = '$';
 					$query = $rewrite['$'];
 					$matches = array('');
 				}
 			} else {
-				foreach ( (array) $rewrite as $match => $query ) {
+				foreach ((array) $rewrite as $match => $query) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path )
-						$request_match = $requested_file . '/' . $requested_path;
+					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path)
+						$request_match = $requested_file.'/'.$requested_path;
 
-					if ( preg_match("#^$match#", $request_match, $matches) ||
-						preg_match("#^$match#", urldecode($request_match), $matches) ) {
+					if (preg_match("#^$match#", $request_match, $matches) ||
+						preg_match("#^$match#", urldecode($request_match), $matches)) {
 
-						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+						if ($wp_rewrite->use_verbose_page_rules && preg_match('/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch)) {
 							// This is a verbose page match, let's check to be sure about it.
-							$page = get_page_by_path( $matches[ $varmatch[1] ] );
-							if ( ! $page ) {
+							$page = get_page_by_path($matches[$varmatch[1]]);
+							if ( ! $page) {
 						 		continue;
 							}
 
-							$post_status_obj = get_post_status_object( $page->post_status );
+							$post_status_obj = get_post_status_object($page->post_status);
 							if ( ! $post_status_obj->public && ! $post_status_obj->protected
-								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+								&& ! $post_status_obj->private && $post_status_obj->exclude_from_search) {
 								continue;
 							}
 						}
@@ -252,7 +252,7 @@ 
 				}
 			}
 
-			if ( isset( $this->matched_rule ) ) {
+			if (isset($this->matched_rule)) {
 				// Trim the query of everything up to the '?'.
 				$query = preg_replace("!^.+\?!", '', $query);
 
@@ -265,16 +265,16 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ('404' == $error)
+					unset($error, $_GET['error']);
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
-				unset( $error, $_GET['error'] );
+			if (empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false) {
+				unset($error, $_GET['error']);
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if (isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false)
+					unset($perma_query_vars);
 
 				$this->did_permalink = false;
 			}
@@ -291,36 +291,36 @@ 
 		 *
 		 * @param array $public_query_vars The array of whitelisted query variables.
 		 */
-		$this->public_query_vars = apply_filters( 'query_vars', $this->public_query_vars );
+		$this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
-		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
-			if ( is_post_type_viewable( $t ) && $t->query_var ) {
+		foreach (get_post_types(array(), 'objects') as $post_type => $t) {
+			if (is_post_type_viewable($t) && $t->query_var) {
 				$post_type_query_vars[$t->query_var] = $post_type;
 			}
 		}
 
-		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
+		foreach ($this->public_query_vars as $wpvar) {
+			if (isset($this->extra_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
+			elseif (isset($_POST[$wpvar]))
 				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
+			elseif (isset($_GET[$wpvar]))
 				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
+			elseif (isset($perma_query_vars[$wpvar]))
 				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
 
-			if ( !empty( $this->query_vars[$wpvar] ) ) {
-				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
+			if ( ! empty($this->query_vars[$wpvar])) {
+				if ( ! is_array($this->query_vars[$wpvar])) {
 					$this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
 				} else {
-					foreach ( $this->query_vars[$wpvar] as $vkey => $v ) {
-						if ( !is_object( $v ) ) {
+					foreach ($this->query_vars[$wpvar] as $vkey => $v) {
+						if ( ! is_object($v)) {
 							$this->query_vars[$wpvar][$vkey] = (string) $v;
 						}
 					}
 				}
 
-				if ( isset($post_type_query_vars[$wpvar] ) ) {
+				if (isset($post_type_query_vars[$wpvar])) {
 					$this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
 					$this->query_vars['name'] = $this->query_vars[$wpvar];
 				}
@@ -328,43 +328,43 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
-				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t)
+			if ($t->query_var && isset($this->query_vars[$t->query_var]))
+				$this->query_vars[$t->query_var] = str_replace(' ', '+', $this->query_vars[$t->query_var]);
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
-		if ( ! is_admin() ) {
-			foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
+		if ( ! is_admin()) {
+			foreach (get_taxonomies(array('publicly_queryable' => false), 'objects') as $taxonomy => $t) {
 				/*
 				 * Disallow when set to the 'taxonomy' query var.
 				 * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().
 				 */
-				if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
-					unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
+				if (isset($this->query_vars['taxonomy']) && $taxonomy === $this->query_vars['taxonomy']) {
+					unset($this->query_vars['taxonomy'], $this->query_vars['term']);
 				}
 			}
 		}
 
 		// Limit publicly queried post_types to those that are publicly_queryable
-		if ( isset( $this->query_vars['post_type']) ) {
-			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
-			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+		if (isset($this->query_vars['post_type'])) {
+			$queryable_post_types = get_post_types(array('publicly_queryable' => true));
+			if ( ! is_array($this->query_vars['post_type'])) {
+				if ( ! in_array($this->query_vars['post_type'], $queryable_post_types))
+					unset($this->query_vars['post_type']);
 			} else {
-				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
+				$this->query_vars['post_type'] = array_intersect($this->query_vars['post_type'], $queryable_post_types);
 			}
 		}
 
 		// Resolve conflicts between posts with numeric slugs and date archive queries.
-		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
+		$this->query_vars = wp_resolve_numeric_slug_conflicts($this->query_vars);
 
-		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
+		foreach ((array) $this->private_query_vars as $var) {
+			if (isset($this->extra_query_vars[$var]))
 				$this->query_vars[$var] = $this->extra_query_vars[$var];
 		}
 
-		if ( isset($error) )
+		if (isset($error))
 			$this->query_vars['error'] = $error;
 
 		/**
@@ -374,7 +374,7 @@ 
 		 *
 		 * @param array $query_vars The array of requested query variables.
 		 */
-		$this->query_vars = apply_filters( 'request', $this->query_vars );
+		$this->query_vars = apply_filters('request', $this->query_vars);
 
 		/**
 		 * Fires once all query variables for the current request have been parsed.
@@ -383,7 +383,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_request', array( &$this ) );
+		do_action_ref_array('parse_request', array(&$this));
 	}
 
 	/**
@@ -401,50 +401,50 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
+		if (is_user_logged_in())
 			$headers = array_merge($headers, wp_get_nocache_headers());
-		if ( ! empty( $this->query_vars['error'] ) ) {
+		if ( ! empty($this->query_vars['error'])) {
 			$status = (int) $this->query_vars['error'];
-			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
+			if (404 === $status) {
+				if ( ! is_user_logged_in())
 					$headers = array_merge($headers, wp_get_nocache_headers());
-				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
-			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
+				$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
+			} elseif (in_array($status, array(403, 500, 502, 503))) {
 				$exit_required = true;
 			}
-		} elseif ( empty( $this->query_vars['feed'] ) ) {
-			$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+		} elseif (empty($this->query_vars['feed'])) {
+			$headers['Content-Type'] = get_option('html_type').'; charset='.get_option('blog_charset');
 		} else {
 			// Set the correct content type for feeds
 			$type = $this->query_vars['feed'];
-			if ( 'feed' == $this->query_vars['feed'] ) {
+			if ('feed' == $this->query_vars['feed']) {
 				$type = get_default_feed();
 			}
-			$headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
+			$headers['Content-Type'] = feed_content_type($type).'; charset='.get_option('blog_charset');
 
 			// We're showing a feed, so WP is indeed the only thing that last changed
-			if ( !empty($this->query_vars['withcomments'])
-				|| false !== strpos( $this->query_vars['feed'], 'comments-' )
-				|| ( empty($this->query_vars['withoutcomments'])
-					&& ( !empty($this->query_vars['p'])
-						|| !empty($this->query_vars['name'])
-						|| !empty($this->query_vars['page_id'])
-						|| !empty($this->query_vars['pagename'])
-						|| !empty($this->query_vars['attachment'])
-						|| !empty($this->query_vars['attachment_id'])
+			if ( ! empty($this->query_vars['withcomments'])
+				|| false !== strpos($this->query_vars['feed'], 'comments-')
+				|| (empty($this->query_vars['withoutcomments'])
+					&& ( ! empty($this->query_vars['p'])
+						|| ! empty($this->query_vars['name'])
+						|| ! empty($this->query_vars['page_id'])
+						|| ! empty($this->query_vars['pagename'])
+						|| ! empty($this->query_vars['attachment'])
+						|| ! empty($this->query_vars['attachment_id'])
 					)
 				)
 			)
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
 			else
 				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
-			$wp_etag = '"' . md5($wp_last_modified) . '"';
+			$wp_etag = '"'.md5($wp_last_modified).'"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
 			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+				$client_etag = wp_unslash($_SERVER['HTTP_IF_NONE_MATCH']);
 			else $client_etag = false;
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@@ -454,9 +454,8 @@ 
 			// Make a timestamp for our most recent modification...
 			$wp_modified_timestamp = strtotime($wp_last_modified);
 
-			if ( ($client_last_modified && $client_etag) ?
-					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
-					 (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
+			if (($client_last_modified && $client_etag) ?
+					 (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) : (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag))) {
 				$status = 304;
 				$exit_required = true;
 			}
@@ -470,23 +469,23 @@ 
 		 * @param array $headers The list of headers to be sent.
 		 * @param WP    $this    Current WordPress environment instance.
 		 */
-		$headers = apply_filters( 'wp_headers', $headers, $this );
+		$headers = apply_filters('wp_headers', $headers, $this);
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty($status))
+			status_header($status);
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
-		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
-			unset( $headers['Last-Modified'] );
+		if (isset($headers['Last-Modified']) && false === $headers['Last-Modified']) {
+			unset($headers['Last-Modified']);
 
 			// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-			if ( function_exists( 'header_remove' ) ) {
-				@header_remove( 'Last-Modified' );
+			if (function_exists('header_remove')) {
+				@header_remove('Last-Modified');
 			} else {
 				// In PHP 5.2, send an empty Last-Modified header, but only as a
 				// last resort to override a header already sent. #WP23021
-				foreach ( headers_list() as $header ) {
-					if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+				foreach (headers_list() as $header) {
+					if (0 === stripos($header, 'Last-Modified')) {
 						$headers['Last-Modified'] = '';
 						break;
 					}
@@ -494,10 +493,10 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
+		foreach ((array) $headers as $name => $field_value)
 			@header("{$name}: {$field_value}");
 
-		if ( $exit_required )
+		if ($exit_required)
 			exit();
 
 		/**
@@ -507,7 +506,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'send_headers', array( &$this ) );
+		do_action_ref_array('send_headers', array(&$this));
 	}
 
 	/**
@@ -521,16 +520,16 @@ 
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
-		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
-			if ( '' != $this->query_vars[$wpvar] ) {
+		foreach ((array) array_keys($this->query_vars) as $wpvar) {
+			if ('' != $this->query_vars[$wpvar]) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( ! is_scalar($this->query_vars[$wpvar])) // Discard non-scalars.
 					continue;
-				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
+				$this->query_string .= $wpvar.'='.rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
 
-		if ( has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+		if (has_filter('query_string')) {  // Don't bother filtering and parsing if no plugins are hooked in.
 			/**
 			 * Filters the query string before parsing.
 			 *
@@ -539,7 +538,7 @@ 
 			 *
 			 * @param string $query_string The query string to modify.
 			 */
-			$this->query_string = apply_filters( 'query_string', $this->query_string );
+			$this->query_string = apply_filters('query_string', $this->query_string);
 			parse_str($this->query_string, $this->query_vars);
 		}
 	}
@@ -567,22 +566,22 @@ 
 		global $wp_query;
 
 		// Extract updated query vars back into global namespace.
-		foreach ( (array) $wp_query->query_vars as $key => $value ) {
-			$GLOBALS[ $key ] = $value;
+		foreach ((array) $wp_query->query_vars as $key => $value) {
+			$GLOBALS[$key] = $value;
 		}
 
 		$GLOBALS['query_string'] = $this->query_string;
 		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
+		$GLOBALS['post'] = isset($wp_query->post) ? $wp_query->post : null;
 		$GLOBALS['request'] = $wp_query->request;
 
-		if ( $wp_query->is_single() || $wp_query->is_page() ) {
+		if ($wp_query->is_single() || $wp_query->is_page()) {
 			$GLOBALS['more']   = 1;
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ($wp_query->is_author() && isset($wp_query->post))
+			$GLOBALS['authordata'] = get_userdata($wp_query->post->post_author);
 	}
 
 	/**
@@ -641,70 +640,70 @@ 
 		 * @param bool     $preempt  Whether to short-circuit default header status handling. Default false.
 		 * @param WP_Query $wp_query WordPress Query object.
 		 */
-		if ( false !== apply_filters( 'pre_handle_404', false, $wp_query ) ) {
+		if (false !== apply_filters('pre_handle_404', false, $wp_query)) {
 			return;
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
+		if (is_404())
 			return;
 
 		// Never 404 for the admin, robots, or if we found posts.
-		if ( is_admin() || is_robots() || $wp_query->posts ) {
+		if (is_admin() || is_robots() || $wp_query->posts) {
 
 			$success = true;
-			if ( is_singular() ) {
+			if (is_singular()) {
 				$p = false;
 
-				if ( $wp_query->post instanceof WP_Post ) {
+				if ($wp_query->post instanceof WP_Post) {
 					$p = clone $wp_query->post;
 				}
 
 				// Only set X-Pingback for single posts that allow pings.
-				if ( $p && pings_open( $p ) ) {
-					@header( 'X-Pingback: ' . get_bloginfo( 'pingback_url' ) );
+				if ($p && pings_open($p)) {
+					@header('X-Pingback: '.get_bloginfo('pingback_url'));
 				}
 
 				// check for paged content that exceeds the max number of pages
 				$next = '<!--nextpage-->';
-				if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
-					$page = trim( $this->query_vars['page'], '/' );
-					$success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
+				if ($p && false !== strpos($p->post_content, $next) && ! empty($this->query_vars['page'])) {
+					$page = trim($this->query_vars['page'], '/');
+					$success = (int) $page <= (substr_count($p->post_content, $next) + 1);
 				}
 			}
 
-			if ( $success ) {
-				status_header( 200 );
+			if ($success) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// We will 404 for paged queries, as no posts were found.
-		if ( ! is_paged() ) {
+		if ( ! is_paged()) {
 
 			// Don't 404 for authors without posts as long as they matched an author on this site.
-			$author = get_query_var( 'author' );
-			if ( is_author() && is_numeric( $author ) && $author > 0 && is_user_member_of_blog( $author ) ) {
-				status_header( 200 );
+			$author = get_query_var('author');
+			if (is_author() && is_numeric($author) && $author > 0 && is_user_member_of_blog($author)) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries if they matched an object.
-			if ( ( is_tag() || is_category() || is_tax() || is_post_type_archive() ) && get_queried_object() ) {
-				status_header( 200 );
+			if ((is_tag() || is_category() || is_tax() || is_post_type_archive()) && get_queried_object()) {
+				status_header(200);
 				return;
 			}
 
 			// Don't 404 for these queries either.
-			if ( is_home() || is_search() || is_feed() ) {
-				status_header( 200 );
+			if (is_home() || is_search() || is_feed()) {
+				status_header(200);
 				return;
 			}
 		}
 
 		// Guess it's time to 404.
 		$wp_query->set_404();
-		status_header( 404 );
+		status_header(404);
 		nocache_headers();
 	}
 
@@ -735,7 +734,7 @@ 
 		 *
 		 * @param WP &$this Current WordPress environment instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp', array( &$this ) );
+		do_action_ref_array('wp', array(&$this));
 	}
 }
 
@@ -825,6 +824,6 @@ 
 	 */
 	public function callback($matches) {
 		$index = intval(substr($matches[0], 9, -1));
-		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+		return (isset($this->_matches[$index]) ? urlencode($this->_matches[$index]) : '');
 	}
 }

Braces +73 added lines, -50 removed lines

@@ -100,8 +100,9 @@ 
 	 * @param string $qv Query variable name.
 	 */
 	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
-			$this->public_query_vars[] = $qv;
+		if ( !in_array($qv, $this->public_query_vars) ) {
+					$this->public_query_vars[] = $qv;
+		}
 	}
 
 	/**
@@ -154,8 +155,9 @@ 
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
-			return;
+		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
+					return;
+		}
 
 		$this->query_vars = array();
 		$post_type_query_vars = array();
@@ -205,8 +207,9 @@ 
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
-					$req_uri = '';
+				if ( $req_uri == $wp_rewrite->index ) {
+									$req_uri = '';
+				}
 				$requested_path = $req_uri;
 			}
 			$requested_file = $req_uri;
@@ -225,8 +228,9 @@ 
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path )
-						$request_match = $requested_file . '/' . $requested_path;
+					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path ) {
+											$request_match = $requested_file . '/' . $requested_path;
+					}
 
 					if ( preg_match("#^$match#", $request_match, $matches) ||
 						preg_match("#^$match#", urldecode($request_match), $matches) ) {
@@ -265,16 +269,18 @@ 
 				parse_str($query, $perma_query_vars);
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
-					unset( $error, $_GET['error'] );
+				if ( '404' == $error ) {
+									unset( $error, $_GET['error'] );
+				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
 			if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
-					unset( $perma_query_vars );
+				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+									unset( $perma_query_vars );
+				}
 
 				$this->did_permalink = false;
 			}
@@ -300,14 +306,15 @@ 
 		}
 
 		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			if ( isset( $this->extra_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
+			} elseif ( isset( $_POST[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_POST[$wpvar];
+			} elseif ( isset( $_GET[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $_GET[$wpvar];
+			} elseif ( isset( $perma_query_vars[$wpvar] ) ) {
+							$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			}
 
 			if ( !empty( $this->query_vars[$wpvar] ) ) {
 				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
@@ -328,9 +335,10 @@ 
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
+		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
+					if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
 				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		}
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
 		if ( ! is_admin() ) {
@@ -349,8 +357,9 @@ 
 		if ( isset( $this->query_vars['post_type']) ) {
 			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
-					unset( $this->query_vars['post_type'] );
+				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
+									unset( $this->query_vars['post_type'] );
+				}
 			} else {
 				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
 			}
@@ -360,12 +369,14 @@ 
 		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
 
 		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
-				$this->query_vars[$var] = $this->extra_query_vars[$var];
+			if ( isset($this->extra_query_vars[$var]) ) {
+							$this->query_vars[$var] = $this->extra_query_vars[$var];
+			}
 		}
 
-		if ( isset($error) )
-			$this->query_vars['error'] = $error;
+		if ( isset($error) ) {
+					$this->query_vars['error'] = $error;
+		}
 
 		/**
 		 * Filters the array of parsed query variables.
@@ -401,13 +412,15 @@ 
 		$status = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
-			$headers = array_merge($headers, wp_get_nocache_headers());
+		if ( is_user_logged_in() ) {
+					$headers = array_merge($headers, wp_get_nocache_headers());
+		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
 			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
-					$headers = array_merge($headers, wp_get_nocache_headers());
+				if ( ! is_user_logged_in() ) {
+									$headers = array_merge($headers, wp_get_nocache_headers());
+				}
 				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
 				$exit_required = true;
@@ -434,18 +447,21 @@ 
 						|| !empty($this->query_vars['attachment_id'])
 					)
 				)
-			)
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
-			else
-				$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			) {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
+			} else {
+							$wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
+			}
 			$wp_etag = '"' . md5($wp_last_modified) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
 			$headers['ETag'] = $wp_etag;
 
 			// Support for Conditional GET
-			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
-			else $client_etag = false;
+			if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+							$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
+			} else {
+				$client_etag = false;
+			}
 
 			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 			// If string is empty, return 0. If not, attempt to parse into a timestamp
@@ -472,8 +488,9 @@ 
 		 */
 		$headers = apply_filters( 'wp_headers', $headers, $this );
 
-		if ( ! empty( $status ) )
-			status_header( $status );
+		if ( ! empty( $status ) ) {
+					status_header( $status );
+		}
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
 		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
@@ -494,11 +511,13 @@ 
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
-			@header("{$name}: {$field_value}");
+		foreach ( (array) $headers as $name => $field_value ) {
+					@header("{$name}: {$field_value}");
+		}
 
-		if ( $exit_required )
-			exit();
+		if ( $exit_required ) {
+					exit();
+		}
 
 		/**
 		 * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
@@ -524,8 +543,10 @@ 
 		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
 			if ( '' != $this->query_vars[$wpvar] ) {
 				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+				if ( !is_scalar($this->query_vars[$wpvar]) ) {
+					// Discard non-scalars.
 					continue;
+				}
 				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
 			}
 		}
@@ -581,8 +602,9 @@ 
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
-			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
+					$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		}
 	}
 
 	/**
@@ -646,8 +668,9 @@ 
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
-			return;
+		if ( is_404() ) {
+					return;
+		}
 
 		// Never 404 for the admin, robots, or if we found posts.
 		if ( is_admin() || is_robots() || $wp_query->posts ) {

src/wp-includes/class.wp-dependencies.php

Doc Comments +3 added lines, -3 removed lines

@@ -270,7 +270,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 * @return void
 	 */
 	public function remove( $handles ) {
@@ -289,7 +289,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
 	public function enqueue( $handles ) {
 		foreach ( (array) $handles as $handle ) {
@@ -311,7 +311,7 @@ 
 	 * @access public
 	 * @since 2.1.0
 	 *
-	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
 	public function dequeue( $handles ) {
 		foreach ( (array) $handles as $handle ) {

Spacing +60 added lines, -60 removed lines

@@ -95,26 +95,26 @@ 
 	 * @param mixed $group   Group level: level (int), no groups (false).
 	 * @return array Handles of items that have been processed.
 	 */
-	public function do_items( $handles = false, $group = false ) {
+	public function do_items($handles = false, $group = false) {
 		/*
 		 * If nothing is passed, print the queue. If a string is passed,
 		 * print that item. If an array is passed, print those items.
 		 */
 		$handles = false === $handles ? $this->queue : (array) $handles;
-		$this->all_deps( $handles );
+		$this->all_deps($handles);
 
-		foreach ( $this->to_do as $key => $handle ) {
-			if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
+		foreach ($this->to_do as $key => $handle) {
+			if ( ! in_array($handle, $this->done, true) && isset($this->registered[$handle])) {
 				/*
 				 * Attempt to process the item. If successful,
 				 * add the handle to the done array.
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
+				if ($this->do_item($handle, $group))
 					$this->done[] = $handle;
 
-				unset( $this->to_do[$key] );
+				unset($this->to_do[$key]);
 			}
 		}
 
@@ -130,7 +130,7 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool True on success, false if not set.
 	 */
-	public function do_item( $handle ) {
+	public function do_item($handle) {
 		return isset($this->registered[$handle]);
 	}
 
@@ -150,43 +150,43 @@ 
 	 * @param int|false $group     Group level: (int) level, (false) no groups.
 	 * @return bool True on success, false on failure.
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
+	public function all_deps($handles, $recursion = false, $group = false) {
+		if ( ! $handles = (array) $handles)
 			return false;
 
-		foreach ( $handles as $handle ) {
+		foreach ($handles as $handle) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if (in_array($handle, $this->done, true)) // Already done
 				continue;
 
-			$moved     = $this->set_group( $handle, $recursion, $group );
-			$new_group = $this->groups[ $handle ];
+			$moved     = $this->set_group($handle, $recursion, $group);
+			$new_group = $this->groups[$handle];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ($queued && ! $moved) // already queued and in the right group
 				continue;
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
+			if ( ! isset($this->registered[$handle]))
 				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
+			elseif ($this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)))
 				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
+			elseif ($this->registered[$handle]->deps && ! $this->all_deps($this->registered[$handle]->deps, true, $new_group))
 				$keep_going = false; // Item requires dependencies that don't exist.
 
-			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
+			if ( ! $keep_going) { // Either item or its dependencies don't exist.
+				if ($recursion)
 					return false; // Abort this branch.
 				else
 					continue; // We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ($queued) // Already grabbed it and its dependencies.
 				continue;
 
-			if ( isset($handle_parts[1]) )
+			if (isset($handle_parts[1]))
 				$this->args[$handle] = $handle_parts[1];
 
 			$this->to_do[] = $handle;
@@ -214,10 +214,10 @@ 
 	 * @param mixed            $args   Optional. Custom property of the item. NOT the class property $args. Examples: $media, $in_footer. 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
-	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
+	public function add($handle, $src, $deps = array(), $ver = false, $args = null) {
+		if (isset($this->registered[$handle]))
 			return false;
-		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
+		$this->registered[$handle] = new _WP_Dependency($handle, $src, $deps, $ver, $args);
 		return true;
 	}
 
@@ -234,11 +234,11 @@ 
 	 * @param mixed  $value  The data value.
 	 * @return bool True on success, false on failure.
 	 */
-	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function add_data($handle, $key, $value) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		return $this->registered[$handle]->add_data( $key, $value );
+		return $this->registered[$handle]->add_data($key, $value);
 	}
 
 	/**
@@ -253,11 +253,11 @@ 
 	 * @param string $key    The data key.
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
-	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
+	public function get_data($handle, $key) {
+		if ( ! isset($this->registered[$handle]))
 			return false;
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
+		if ( ! isset($this->registered[$handle]->extra[$key]))
 			return false;
 
 		return $this->registered[$handle]->extra[$key];
@@ -273,8 +273,8 @@ 
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 * @return void
 	 */
-	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
+	public function remove($handles) {
+		foreach ((array) $handles as $handle)
 			unset($this->registered[$handle]);
 	}
 
@@ -292,12 +292,12 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function enqueue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function enqueue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
-			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
+			if ( ! in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]])) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
+				if (isset($handle[1]))
 					$this->args[$handle[0]] = $handle[1];
 			}
 		}
@@ -315,11 +315,11 @@ 
 	 *
 	 * @param mixed $handles Item handle and argument (string) or item handles and arguments (array of strings).
 	 */
-	public function dequeue( $handles ) {
-		foreach ( (array) $handles as $handle ) {
+	public function dequeue($handles) {
+		foreach ((array) $handles as $handle) {
 			$handle = explode('?', $handle);
 			$key = array_search($handle[0], $this->queue);
-			if ( false !== $key ) {
+			if (false !== $key) {
 				unset($this->queue[$key]);
 				unset($this->args[$handle[0]]);
 			}
@@ -335,15 +335,15 @@ 
 	 * @param string $handle Name of the item. Should be unique.
 	 * @return bool Whether the handle is found after recursively searching the dependency tree.
 	 */
-	protected function recurse_deps( $queue, $handle ) {
-		foreach ( $queue as $queued ) {
-			if ( ! isset( $this->registered[ $queued ] ) ) {
+	protected function recurse_deps($queue, $handle) {
+		foreach ($queue as $queued) {
+			if ( ! isset($this->registered[$queued])) {
 				continue;
 			}
 
-			if ( in_array( $handle, $this->registered[ $queued ]->deps ) ) {
+			if (in_array($handle, $this->registered[$queued]->deps)) {
 				return true;
-			} elseif ( $this->recurse_deps( $this->registered[ $queued ]->deps, $handle ) ) {
+			} elseif ($this->recurse_deps($this->registered[$queued]->deps, $handle)) {
 				return true;
 			}
 		}
@@ -362,28 +362,28 @@ 
 	 * @param string $list   Property name of list array.
 	 * @return bool|_WP_Dependency Found, or object Item data.
 	 */
-	public function query( $handle, $list = 'registered' ) {
-		switch ( $list ) {
+	public function query($handle, $list = 'registered') {
+		switch ($list) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if (isset($this->registered[$handle]))
+					return $this->registered[$handle];
 				return false;
 
 			case 'enqueued' :
 			case 'queue' :
-				if ( in_array( $handle, $this->queue ) ) {
+				if (in_array($handle, $this->queue)) {
 					return true;
 				}
-				return $this->recurse_deps( $this->queue, $handle );
+				return $this->recurse_deps($this->queue, $handle);
 
 			case 'to_do' :
 			case 'to_print': // back compat
-				return in_array( $handle, $this->to_do );
+				return in_array($handle, $this->to_do);
 
 			case 'done' :
 			case 'printed': // back compat
-				return in_array( $handle, $this->done );
+				return in_array($handle, $this->done);
 		}
 		return false;
 	}
@@ -399,14 +399,14 @@ 
 	 * @param mixed  $group     Group level.
 	 * @return bool Not already in the group or a lower group
 	 */
-	public function set_group( $handle, $recursion, $group ) {
+	public function set_group($handle, $recursion, $group) {
 		$group = (int) $group;
 
-		if ( isset( $this->groups[ $handle ] ) && $this->groups[ $handle ] <= $group ) {
+		if (isset($this->groups[$handle]) && $this->groups[$handle] <= $group) {
 			return false;
 		}
 
-		$this->groups[ $handle ] = $group;
+		$this->groups[$handle] = $group;
 
 		return true;
 	}
@@ -467,7 +467,7 @@ 
 	 * @since 2.6.0
 	 * @var null
 	 */
-	public $args = null;  // Custom property, such as $in_footer or $media.
+	public $args = null; // Custom property, such as $in_footer or $media.
 
 	/**
 	 * Extra data to supply to the handle.
@@ -484,8 +484,8 @@ 
 	 * @since 2.6.0
 	 */
 	public function __construct() {
-		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
+		@list($this->handle, $this->src, $this->deps, $this->ver, $this->args) = func_get_args();
+		if ( ! is_array($this->deps))
 			$this->deps = array();
 	}
 
@@ -499,8 +499,8 @@ 
 	 * @param mixed  $data The data value to add.
 	 * @return bool False if not scalar, true otherwise.
 	 */
-	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
+	public function add_data($name, $data) {
+		if ( ! is_scalar($name))
 			return false;
 		$this->extra[$name] = $data;
 		return true;

Braces +65 added lines, -37 removed lines

@@ -111,8 +111,9 @@ 
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
-					$this->done[] = $handle;
+				if ( $this->do_item( $handle, $group ) ) {
+									$this->done[] = $handle;
+				}
 
 				unset( $this->to_do[$key] );
 			}
@@ -151,43 +152,61 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
-			return false;
+		if ( !$handles = (array) $handles ) {
+					return false;
+		}
 
 		foreach ( $handles as $handle ) {
 			$handle_parts = explode('?', $handle);
 			$handle = $handle_parts[0];
 			$queued = in_array($handle, $this->to_do, true);
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if ( in_array($handle, $this->done, true) ) {
+				// Already done
 				continue;
+			}
 
 			$moved     = $this->set_group( $handle, $recursion, $group );
 			$new_group = $this->groups[ $handle ];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ( $queued && !$moved ) {
+				// already queued and in the right group
 				continue;
+			}
 
 			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
-				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
-				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
-				$keep_going = false; // Item requires dependencies that don't exist.
+			if ( !isset($this->registered[$handle]) ) {
+							$keep_going = false;
+			}
+			// Item doesn't exist.
+			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
+			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) ) {
+							$keep_going = false;
+			}
+			// Item requires dependencies that don't exist.
 
 			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
-					return false; // Abort this branch.
-				else
-					continue; // We're at the top level. Move on to the next one.
+				if ( $recursion ) {
+									return false;
+				}
+				// Abort this branch.
+				else {
+									continue;
+				}
+				// We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
+			if ( $queued ) {
+				// Already grabbed it and its dependencies.
 				continue;
+			}
 
-			if ( isset($handle_parts[1]) )
-				$this->args[$handle] = $handle_parts[1];
+			if ( isset($handle_parts[1]) ) {
+							$this->args[$handle] = $handle_parts[1];
+			}
 
 			$this->to_do[] = $handle;
 		}
@@ -215,8 +234,9 @@ 
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
-			return false;
+		if ( isset($this->registered[$handle]) ) {
+					return false;
+		}
 		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
 		return true;
 	}
@@ -235,8 +255,9 @@ 
 	 * @return bool True on success, false on failure.
 	 */
 	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->add_data( $key, $value );
 	}
@@ -254,11 +275,13 @@ 
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
 	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
-			return false;
+		if ( !isset( $this->registered[$handle] ) ) {
+					return false;
+		}
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
-			return false;
+		if ( !isset( $this->registered[$handle]->extra[$key] ) ) {
+					return false;
+		}
 
 		return $this->registered[$handle]->extra[$key];
 	}
@@ -274,8 +297,9 @@ 
 	 * @return void
 	 */
 	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
-			unset($this->registered[$handle]);
+		foreach ( (array) $handles as $handle ) {
+					unset($this->registered[$handle]);
+		}
 	}
 
 	/**
@@ -297,8 +321,9 @@ 
 			$handle = explode('?', $handle);
 			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
-					$this->args[$handle[0]] = $handle[1];
+				if ( isset($handle[1]) ) {
+									$this->args[$handle[0]] = $handle[1];
+				}
 			}
 		}
 	}
@@ -366,8 +391,9 @@ 
 		switch ( $list ) {
 			case 'registered' :
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
-					return $this->registered[ $handle ];
+				if ( isset( $this->registered[ $handle ] ) ) {
+									return $this->registered[ $handle ];
+				}
 				return false;
 
 			case 'enqueued' :
@@ -485,8 +511,9 @@ 
 	 */
 	public function __construct() {
 		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
-			$this->deps = array();
+		if ( ! is_array($this->deps) ) {
+					$this->deps = array();
+		}
 	}
 
 	/**
@@ -500,8 +527,9 @@ 
 	 * @return bool False if not scalar, true otherwise.
 	 */
 	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
-			return false;
+		if ( !is_scalar($name) ) {
+					return false;
+		}
 		$this->extra[$name] = $data;
 		return true;
 	}

src/wp-includes/date.php

Doc Comments +2 added lines, -2 removed lines

@@ -799,7 +799,7 @@ 
 	 *
 	 * @param string $compare The compare operator to use
 	 * @param string|array $value The value
-	 * @return string|false|int The value to be used in SQL or false on error.
+	 * @return string The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
 		if ( ! isset( $value ) )
@@ -862,7 +862,7 @@ 
 	 *                                     of $datetime that are arrays, or string values that are a
 	 *                                     subset of MySQL date format ('Y', 'Y-m', 'Y-m-d', 'Y-m-d H:i').
 	 *                                     Default: false.
-	 * @return string|false A MySQL format date/time or false on failure
+	 * @return string A MySQL format date/time or false on failure
 	 */
 	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
 		$now = current_time( 'timestamp' );

Braces +60 added lines, -40 removed lines

@@ -270,8 +270,9 @@ 
 	 * @return string The comparison operator.
 	 */
 	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+					return strtoupper( $query['compare'] );
+		}
 
 		return $this->compare;
 	}
@@ -735,16 +736,19 @@ 
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty( $query['after'] ) ) {
+					$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		}
 
-		if ( ! empty( $query['before'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty( $query['before'] ) ) {
+					$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		}
 
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
-			$where_parts[] = "YEAR( $column ) $compare $value";
+		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
+					$where_parts[] = "YEAR( $column ) $compare $value";
+		}
 
 		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
@@ -756,17 +760,21 @@ 
 		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
 			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
-			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) ) {
+					$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		}
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
-			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) ) {
+					$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
-			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) ) {
+					$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
-			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) ) {
+					$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		}
 
 		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
 			// Avoid notices.
@@ -802,8 +810,9 @@ 
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
-			return false;
+		if ( ! isset( $value ) ) {
+					return false;
+		}
 
 		switch ( $compare ) {
 			case 'IN':
@@ -914,23 +923,29 @@ 
 
 		$datetime = array_map( 'absint', $datetime );
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset( $datetime['year'] ) ) {
+					$datetime['year'] = gmdate( 'Y', $now );
+		}
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset( $datetime['month'] ) ) {
+					$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		}
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset( $datetime['day'] ) ) {
+					$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		}
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset( $datetime['hour'] ) ) {
+					$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		}
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['minute'] ) ) {
+					$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		}
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['second'] ) ) {
+					$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		}
 
 		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
 	}
@@ -956,21 +971,25 @@ 
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
-			return false;
+		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {
+					return false;
+		}
 
 		// Complex combined queries aren't supported for multi-value queries
 		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
-				$return[] = "HOUR( $column ) $compare $value";
+			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+							$return[] = "HOUR( $column ) $compare $value";
+			}
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
-				$return[] = "MINUTE( $column ) $compare $value";
+			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+							$return[] = "MINUTE( $column ) $compare $value";
+			}
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
-				$return[] = "SECOND( $column ) $compare $value";
+			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+							$return[] = "SECOND( $column ) $compare $value";
+			}
 
 			return implode( ' AND ', $return );
 		}
@@ -985,8 +1004,9 @@ 
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
-			return false;
+		if ( ! isset( $minute ) ) {
+					return false;
+		}
 
 		$format = $time = '';
 

Spacing +197 added lines, -197 removed lines

@@ -60,7 +60,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
+	public $time_keys = array('after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second');
 
 	/**
 	 * Constructor.
@@ -150,38 +150,38 @@ 
 	 *                              Accepts 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
 	 *                              'comment_date', 'comment_date_gmt'.
 	 */
-	public function __construct( $date_query, $default_column = 'post_date' ) {
+	public function __construct($date_query, $default_column = 'post_date') {
 
-		if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
+		if (isset($date_query['relation']) && 'OR' === strtoupper($date_query['relation'])) {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		if ( ! is_array( $date_query ) ) {
+		if ( ! is_array($date_query)) {
 			return;
 		}
 
 		// Support for passing time-based keys in the top level of the $date_query array.
-		if ( ! isset( $date_query[0] ) && ! empty( $date_query ) ) {
-			$date_query = array( $date_query );
+		if ( ! isset($date_query[0]) && ! empty($date_query)) {
+			$date_query = array($date_query);
 		}
 
-		if ( empty( $date_query ) ) {
+		if (empty($date_query)) {
 			return;
 		}
 
-		if ( ! empty( $date_query['column'] ) ) {
-			$date_query['column'] = esc_sql( $date_query['column'] );
+		if ( ! empty($date_query['column'])) {
+			$date_query['column'] = esc_sql($date_query['column']);
 		} else {
-			$date_query['column'] = esc_sql( $default_column );
+			$date_query['column'] = esc_sql($default_column);
 		}
 
-		$this->column = $this->validate_column( $this->column );
+		$this->column = $this->validate_column($this->column);
 
-		$this->compare = $this->get_compare( $date_query );
+		$this->compare = $this->get_compare($date_query);
 
-		$this->queries = $this->sanitize_query( $date_query );
+		$this->queries = $this->sanitize_query($date_query);
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 *
 	 * @return array Sanitized queries.
 	 */
-	public function sanitize_query( $queries, $parent_query = null ) {
+	public function sanitize_query($queries, $parent_query = null) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -209,37 +209,37 @@ 
 		);
 
 		// Numeric keys should always have array values.
-		foreach ( $queries as $qkey => $qvalue ) {
-			if ( is_numeric( $qkey ) && ! is_array( $qvalue ) ) {
-				unset( $queries[ $qkey ] );
+		foreach ($queries as $qkey => $qvalue) {
+			if (is_numeric($qkey) && ! is_array($qvalue)) {
+				unset($queries[$qkey]);
 			}
 		}
 
 		// Each query should have a value for each default key. Inherit from the parent when possible.
-		foreach ( $defaults as $dkey => $dvalue ) {
-			if ( isset( $queries[ $dkey ] ) ) {
+		foreach ($defaults as $dkey => $dvalue) {
+			if (isset($queries[$dkey])) {
 				continue;
 			}
 
-			if ( isset( $parent_query[ $dkey ] ) ) {
-				$queries[ $dkey ] = $parent_query[ $dkey ];
+			if (isset($parent_query[$dkey])) {
+				$queries[$dkey] = $parent_query[$dkey];
 			} else {
-				$queries[ $dkey ] = $dvalue;
+				$queries[$dkey] = $dvalue;
 			}
 		}
 
 		// Validate the dates passed in the query.
-		if ( $this->is_first_order_clause( $queries ) ) {
-			$this->validate_date_values( $queries );
+		if ($this->is_first_order_clause($queries)) {
+			$this->validate_date_values($queries);
 		}
 
-		foreach ( $queries as $key => $q ) {
-			if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
+		foreach ($queries as $key => $q) {
+			if ( ! is_array($q) || in_array($key, $this->time_keys, true)) {
 				// This is a first-order query. Trust the values and sanitize when building SQL.
-				$cleaned_query[ $key ] = $q;
+				$cleaned_query[$key] = $q;
 			} else {
 				// Any array without a time key is another query, so we recurse.
-				$cleaned_query[] = $this->sanitize_query( $q, $queries );
+				$cleaned_query[] = $this->sanitize_query($q, $queries);
 			}
 		}
 
@@ -255,9 +255,9 @@ 
 	 * @param  array $query Query clause.
 	 * @return bool True if this is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		$time_keys = array_intersect( $this->time_keys, array_keys( $query ) );
-		return ! empty( $time_keys );
+	protected function is_first_order_clause($query) {
+		$time_keys = array_intersect($this->time_keys, array_keys($query));
+		return ! empty($time_keys);
 	}
 
 	/**
@@ -269,9 +269,9 @@ 
 	 * @param array $query A date query or a date subquery.
 	 * @return string The comparison operator.
 	 */
-	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+	public function get_compare($query) {
+		if ( ! empty($query['compare']) && in_array($query['compare'], array('=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN')))
+			return strtoupper($query['compare']);
 
 		return $this->compare;
 	}
@@ -289,8 +289,8 @@ 
 	 * @param  array $date_query The date_query array.
 	 * @return bool  True if all values in the query are valid, false if one or more fail.
 	 */
-	public function validate_date_values( $date_query = array() ) {
-		if ( empty( $date_query ) ) {
+	public function validate_date_values($date_query = array()) {
+		if (empty($date_query)) {
 			return false;
 		}
 
@@ -301,30 +301,30 @@ 
 		 * validation routine continue to be sure that all invalid
 		 * values generate errors too.
 		 */
-		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ){
-			$valid = $this->validate_date_values( $date_query['before'] );
+		if (array_key_exists('before', $date_query) && is_array($date_query['before'])) {
+			$valid = $this->validate_date_values($date_query['before']);
 		}
 
-		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ){
-			$valid = $this->validate_date_values( $date_query['after'] );
+		if (array_key_exists('after', $date_query) && is_array($date_query['after'])) {
+			$valid = $this->validate_date_values($date_query['after']);
 		}
 
 		// Array containing all min-max checks.
 		$min_max_checks = array();
 
 		// Days per year.
-		if ( array_key_exists( 'year', $date_query ) ) {
+		if (array_key_exists('year', $date_query)) {
 			/*
 			 * If a year exists in the date query, we can use it to get the days.
 			 * If multiple years are provided (as in a BETWEEN), use the first one.
 			 */
-			if ( is_array( $date_query['year'] ) ) {
-				$_year = reset( $date_query['year'] );
+			if (is_array($date_query['year'])) {
+				$_year = reset($date_query['year']);
 			} else {
 				$_year = $date_query['year'];
 			}
 
-			$max_days_of_year = date( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1;
+			$max_days_of_year = date('z', mktime(0, 0, 0, 12, 31, $_year)) + 1;
 		} else {
 			// otherwise we use the max of 366 (leap-year)
 			$max_days_of_year = 366;
@@ -354,12 +354,12 @@ 
 		);
 
 		// Weeks per year.
-		if ( isset( $_year ) ) {
+		if (isset($_year)) {
 			/*
 			 * If we have a specific year, use it to calculate number of weeks.
 			 * Note: the number of weeks in a year is the date in which Dec 28 appears.
 			 */
-			$week_count = date( 'W', mktime( 0, 0, 0, 12, 28, $_year ) );
+			$week_count = date('W', mktime(0, 0, 0, 12, 28, $_year));
 
 		} else {
 			// Otherwise set the week-count to a maximum of 53.
@@ -396,26 +396,26 @@ 
 		);
 
 		// Concatenate and throw a notice for each invalid value.
-		foreach ( $min_max_checks as $key => $check ) {
-			if ( ! array_key_exists( $key, $date_query ) ) {
+		foreach ($min_max_checks as $key => $check) {
+			if ( ! array_key_exists($key, $date_query)) {
 				continue;
 			}
 
 			// Throw a notice for each failing value.
-			foreach ( (array) $date_query[ $key ] as $_value ) {
+			foreach ((array) $date_query[$key] as $_value) {
 				$is_between = $_value >= $check['min'] && $_value <= $check['max'];
 
-				if ( ! is_numeric( $_value ) || ! $is_between ) {
+				if ( ! is_numeric($_value) || ! $is_between) {
 					$error = sprintf(
 						/* translators: Date query invalid date message: 1: invalid value, 2: type of value, 3: minimum valid value, 4: maximum valid value */
-						__( 'Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.' ),
-						'<code>' . esc_html( $_value ) . '</code>',
-						'<code>' . esc_html( $key ) . '</code>',
-						'<code>' . esc_html( $check['min'] ) . '</code>',
-						'<code>' . esc_html( $check['max'] ) . '</code>'
+						__('Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.'),
+						'<code>'.esc_html($_value).'</code>',
+						'<code>'.esc_html($key).'</code>',
+						'<code>'.esc_html($check['min']).'</code>',
+						'<code>'.esc_html($check['max']).'</code>'
 					);
 
-					_doing_it_wrong( __CLASS__, $error, '4.1.0' );
+					_doing_it_wrong(__CLASS__, $error, '4.1.0');
 
 					$valid = false;
 				}
@@ -423,49 +423,49 @@ 
 		}
 
 		// If we already have invalid date messages, don't bother running through checkdate().
-		if ( ! $valid ) {
+		if ( ! $valid) {
 			return $valid;
 		}
 
 		$day_month_year_error_msg = '';
 
-		$day_exists   = array_key_exists( 'day', $date_query ) && is_numeric( $date_query['day'] );
-		$month_exists = array_key_exists( 'month', $date_query ) && is_numeric( $date_query['month'] );
-		$year_exists  = array_key_exists( 'year', $date_query ) && is_numeric( $date_query['year'] );
+		$day_exists   = array_key_exists('day', $date_query) && is_numeric($date_query['day']);
+		$month_exists = array_key_exists('month', $date_query) && is_numeric($date_query['month']);
+		$year_exists  = array_key_exists('year', $date_query) && is_numeric($date_query['year']);
 
-		if ( $day_exists && $month_exists && $year_exists ) {
+		if ($day_exists && $month_exists && $year_exists) {
 			// 1. Checking day, month, year combination.
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], $date_query['year'], sprintf( '%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], $date_query['year'], sprintf('%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day']))) {
 				/* translators: 1: year, 2: month, 3: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.' ),
-					'<code>' . esc_html( $date_query['year'] ) . '</code>',
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.'),
+					'<code>'.esc_html($date_query['year']).'</code>',
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 
-		} elseif ( $day_exists && $month_exists ) {
+		} elseif ($day_exists && $month_exists) {
 			/*
 			 * 2. checking day, month combination
 			 * We use 2012 because, as a leap year, it's the most permissive.
 			 */
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], 2012, sprintf( '2012-%s-%s', $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], 2012, sprintf('2012-%s-%s', $date_query['month'], $date_query['day']))) {
 				/* translators: 1: month, 2: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: month %1$s, day %2$s.' ),
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: month %1$s, day %2$s.'),
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 		}
 
-		if ( ! empty( $day_month_year_error_msg ) ) {
-			_doing_it_wrong( __CLASS__, $day_month_year_error_msg, '4.1.0' );
+		if ( ! empty($day_month_year_error_msg)) {
+			_doing_it_wrong(__CLASS__, $day_month_year_error_msg, '4.1.0');
 		}
 
 		return $valid;
@@ -485,7 +485,7 @@ 
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
 	 */
-	public function validate_column( $column ) {
+	public function validate_column($column) {
 		global $wpdb;
 
 		$valid_columns = array(
@@ -495,7 +495,7 @@ 
 		);
 
 		// Attempt to detect a table prefix.
-		if ( false === strpos( $column, '.' ) ) {
+		if (false === strpos($column, '.')) {
 			/**
 			 * Filter the list of valid date query columns.
 			 *
@@ -507,7 +507,7 @@ 
 			 *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt',
 			 *	                           'user_registered'
 			 */
-			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
+			if ( ! in_array($column, apply_filters('date_query_valid_columns', $valid_columns))) {
 				$column = 'post_date';
 			}
 
@@ -528,9 +528,9 @@ 
 			);
 
 			// If it's a known column name, add the appropriate table prefix.
-			foreach ( $known_columns as $table_name => $table_columns ) {
-				if ( in_array( $column, $table_columns ) ) {
-					$column = $table_name . '.' . $column;
+			foreach ($known_columns as $table_name => $table_columns) {
+				if (in_array($column, $table_columns)) {
+					$column = $table_name.'.'.$column;
 					break;
 				}
 			}
@@ -538,7 +538,7 @@ 
 		}
 
 		// Remove unsafe characters.
-		return preg_replace( '/[^a-zA-Z0-9_$\.]/', '', $column );
+		return preg_replace('/[^a-zA-Z0-9_$\.]/', '', $column);
 	}
 
 	/**
@@ -562,7 +562,7 @@ 
 		 * @param string        $where WHERE clause of the date query.
 		 * @param WP_Date_Query $this  The WP_Date_Query instance.
 		 */
-		return apply_filters( 'get_date_sql', $where, $this );
+		return apply_filters('get_date_sql', $where, $this);
 	}
 
 	/**
@@ -582,10 +582,10 @@ 
 	 * }
 	 */
 	protected function get_sql_clauses() {
-		$sql = $this->get_sql_for_query( $this->queries );
+		$sql = $this->get_sql_for_query($this->queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -610,7 +610,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( $query, $depth = 0 ) {
+	protected function get_sql_for_query($query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -622,32 +622,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => $clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => $clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -656,21 +656,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -693,8 +693,8 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_subquery( $query ) {
-		return $this->get_sql_for_clause( $query, '' );
+	protected function get_sql_for_subquery($query) {
+		return $this->get_sql_for_clause($query, '');
 	}
 
 	/**
@@ -712,72 +712,72 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_clause( $query, $parent_query ) {
+	protected function get_sql_for_clause($query, $parent_query) {
 		global $wpdb;
 
 		// The sub-parts of a $where part.
 		$where_parts = array();
 
-		$column = ( ! empty( $query['column'] ) ) ? esc_sql( $query['column'] ) : $this->column;
+		$column = ( ! empty($query['column'])) ? esc_sql($query['column']) : $this->column;
 
-		$column = $this->validate_column( $column );
+		$column = $this->validate_column($column);
 
-		$compare = $this->get_compare( $query );
+		$compare = $this->get_compare($query);
 
-		$inclusive = ! empty( $query['inclusive'] );
+		$inclusive = ! empty($query['inclusive']);
 
 		// Assign greater- and less-than values.
 		$lt = '<';
 		$gt = '>';
 
-		if ( $inclusive ) {
+		if ($inclusive) {
 			$lt .= '=';
 			$gt .= '=';
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty($query['after']))
+			$where_parts[] = $wpdb->prepare("$column $gt %s", $this->build_mysql_datetime($query['after'], ! $inclusive));
 
-		if ( ! empty( $query['before'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty($query['before']))
+			$where_parts[] = $wpdb->prepare("$column $lt %s", $this->build_mysql_datetime($query['before'], $inclusive));
 
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
+		if (isset($query['year']) && $value = $this->build_value($compare, $query['year']))
 			$where_parts[] = "YEAR( $column ) $compare $value";
 
-		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
+		if (isset($query['month']) && $value = $this->build_value($compare, $query['month'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
-		} elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
+		} elseif (isset($query['monthnum']) && $value = $this->build_value($compare, $query['monthnum'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
 		}
-		if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
+		if (isset($query['week']) && false !== ($value = $this->build_value($compare, $query['week']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
+		} elseif (isset($query['w']) && false !== ($value = $this->build_value($compare, $query['w']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
+		if (isset($query['dayofyear']) && $value = $this->build_value($compare, $query['dayofyear']))
 			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
+		if (isset($query['day']) && $value = $this->build_value($compare, $query['day']))
 			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
+		if (isset($query['dayofweek']) && $value = $this->build_value($compare, $query['dayofweek']))
 			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
+		if (isset($query['dayofweek_iso']) && $value = $this->build_value($compare, $query['dayofweek_iso']))
 			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
 
-		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
+		if (isset($query['hour']) || isset($query['minute']) || isset($query['second'])) {
 			// Avoid notices.
-			foreach ( array( 'hour', 'minute', 'second' ) as $unit ) {
-				if ( ! isset( $query[ $unit ] ) ) {
-					$query[ $unit ] = null;
+			foreach (array('hour', 'minute', 'second') as $unit) {
+				if ( ! isset($query[$unit])) {
+					$query[$unit] = null;
 				}
 			}
 
-			if ( $time_query = $this->build_time_query( $column, $compare, $query['hour'], $query['minute'], $query['second'] ) ) {
+			if ($time_query = $this->build_time_query($column, $compare, $query['hour'], $query['minute'], $query['second'])) {
 				$where_parts[] = $time_query;
 			}
 		}
@@ -802,45 +802,45 @@ 
 	 * @param string|array $value The value
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
-	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
+	public function build_value($compare, $value) {
+		if ( ! isset($value))
 			return false;
 
-		switch ( $compare ) {
+		switch ($compare) {
 			case 'IN':
 			case 'NOT IN':
 				$value = (array) $value;
 
 				// Remove non-numeric values.
-				$value = array_filter( $value, 'is_numeric' );
+				$value = array_filter($value, 'is_numeric');
 
-				if ( empty( $value ) ) {
+				if (empty($value)) {
 					return false;
 				}
 
-				return '(' . implode( ',', array_map( 'intval', $value ) ) . ')';
+				return '('.implode(',', array_map('intval', $value)).')';
 
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
-				if ( ! is_array( $value ) || 2 != count( $value ) ) {
-					$value = array( $value, $value );
+				if ( ! is_array($value) || 2 != count($value)) {
+					$value = array($value, $value);
 				} else {
-					$value = array_values( $value );
+					$value = array_values($value);
 				}
 
 				// If either value is non-numeric, bail.
-				foreach ( $value as $v ) {
-					if ( ! is_numeric( $v ) ) {
+				foreach ($value as $v) {
+					if ( ! is_numeric($v)) {
 						return false;
 					}
 				}
 
-				$value = array_map( 'intval', $value );
+				$value = array_map('intval', $value);
 
-				return $value[0] . ' AND ' . $value[1];
+				return $value[0].' AND '.$value[1];
 
 			default;
-				if ( ! is_numeric( $value ) ) {
+				if ( ! is_numeric($value)) {
 					return false;
 				}
 
@@ -865,75 +865,75 @@ 
 	 *                                     Default: false.
 	 * @return string|false A MySQL format date/time or false on failure
 	 */
-	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
-		$now = current_time( 'timestamp' );
+	public function build_mysql_datetime($datetime, $default_to_max = false) {
+		$now = current_time('timestamp');
 
-		if ( ! is_array( $datetime ) ) {
+		if ( ! is_array($datetime)) {
 
 			/*
 			 * Try to parse some common date formats, so we can detect
 			 * the level of precision and support the 'inclusive' parameter.
 			 */
-			if ( preg_match( '/^(\d{4})$/', $datetime, $matches ) ) {
+			if (preg_match('/^(\d{4})$/', $datetime, $matches)) {
 				// Y
 				$datetime = array(
-					'year' => intval( $matches[1] ),
+					'year' => intval($matches[1]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
-					'day'   => intval( $matches[3] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
+					'day'   => intval($matches[3]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d H:i
 				$datetime = array(
-					'year'   => intval( $matches[1] ),
-					'month'  => intval( $matches[2] ),
-					'day'    => intval( $matches[3] ),
-					'hour'   => intval( $matches[4] ),
-					'minute' => intval( $matches[5] ),
+					'year'   => intval($matches[1]),
+					'month'  => intval($matches[2]),
+					'day'    => intval($matches[3]),
+					'hour'   => intval($matches[4]),
+					'minute' => intval($matches[5]),
 				);
 			}
 
 			// If no match is found, we don't support default_to_max.
-			if ( ! is_array( $datetime ) ) {
+			if ( ! is_array($datetime)) {
 				// @todo Timezone issues here possibly
-				return gmdate( 'Y-m-d H:i:s', strtotime( $datetime, $now ) );
+				return gmdate('Y-m-d H:i:s', strtotime($datetime, $now));
 			}
 		}
 
-		$datetime = array_map( 'absint', $datetime );
+		$datetime = array_map('absint', $datetime);
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset($datetime['year']))
+			$datetime['year'] = gmdate('Y', $now);
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset($datetime['month']))
+			$datetime['month'] = ($default_to_max) ? 12 : 1;
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset($datetime['day']))
+			$datetime['day'] = ($default_to_max) ? (int) date('t', mktime(0, 0, 0, $datetime['month'], 1, $datetime['year'])) : 1;
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset($datetime['hour']))
+			$datetime['hour'] = ($default_to_max) ? 23 : 0;
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['minute']))
+			$datetime['minute'] = ($default_to_max) ? 59 : 0;
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['second']))
+			$datetime['second'] = ($default_to_max) ? 59 : 0;
 
-		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
+		return sprintf('%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second']);
 	}
 
 	/**
@@ -953,48 +953,48 @@ 
 	 * @param int|null $second Optional. A second value (0-59).
 	 * @return string|false A query part or false on failure.
 	 */
-	public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
+	public function build_time_query($column, $compare, $hour = null, $minute = null, $second = null) {
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
+		if ( ! isset($hour) && ! isset($minute) && ! isset($second))
 			return false;
 
 		// Complex combined queries aren't supported for multi-value queries
-		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+		if (in_array($compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
+			if (isset($hour) && false !== ($value = $this->build_value($compare, $hour)))
 				$return[] = "HOUR( $column ) $compare $value";
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
+			if (isset($minute) && false !== ($value = $this->build_value($compare, $minute)))
 				$return[] = "MINUTE( $column ) $compare $value";
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
+			if (isset($second) && false !== ($value = $this->build_value($compare, $second)))
 				$return[] = "SECOND( $column ) $compare $value";
 
-			return implode( ' AND ', $return );
+			return implode(' AND ', $return);
 		}
 
 		// Cases where just one unit is set
-		if ( isset( $hour ) && ! isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+		if (isset($hour) && ! isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $hour))) {
 			return "HOUR( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+		} elseif ( ! isset($hour) && isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $minute))) {
 			return "MINUTE( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && ! isset( $minute ) && isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+		} elseif ( ! isset($hour) && ! isset($minute) && isset($second) && false !== ($value = $this->build_value($compare, $second))) {
 			return "SECOND( $column ) $compare $value";
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
+		if ( ! isset($minute))
 			return false;
 
 		$format = $time = '';
 
 		// Hour
-		if ( null !== $hour ) {
+		if (null !== $hour) {
 			$format .= '%H.';
-			$time   .= sprintf( '%02d', $hour ) . '.';
+			$time   .= sprintf('%02d', $hour).'.';
 		} else {
 			$format .= '0.';
 			$time   .= '0.';
@@ -1002,13 +1002,13 @@ 
 
 		// Minute
 		$format .= '%i';
-		$time   .= sprintf( '%02d', $minute );
+		$time   .= sprintf('%02d', $minute);
 
-		if ( isset( $second ) ) {
+		if (isset($second)) {
 			$format .= '%s';
-			$time   .= sprintf( '%02d', $second );
+			$time   .= sprintf('%02d', $second);
 		}
 
-		return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+		return $wpdb->prepare("DATE_FORMAT( $column, %s ) $compare %f", $format, $time);
 	}
 }