zytzagoo / smtp-validate-email

smtp-validate-email.php

Spacing +37 added lines, -37 removed lines

@@ -201,8 +201,8 @@ 
         if (!$this->catchall_test) {
             return false;
         }
-        $test = 'catch-all-test-' . time();
-        $accepted = $this->rcpt($test . '@' . $domain);
+        $test = 'catch-all-test-'.time();
+        $accepted = $this->rcpt($test.'@'.$domain);
         if ($accepted) {
             // success on a non-existing address is a "catch-all"
             $this->domains_info[$domain]['catchall'] = true;
@@ -212,7 +212,7 @@ 
         // while trying to perform a catchall detect
         $this->noop();
         if (!($this->connected())) {
-            $this->debug('Disconnected after trying a non-existing recipient on ' . $domain);
+            $this->debug('Disconnected after trying a non-existing recipient on '.$domain);
         }
         // nb: disconnects are considered as a non-catch-all case this way
         // this might not be true always
@@ -257,7 +257,7 @@ 
             // add the hostname itself with 0 weight (RFC 2821)
             $mxs[$domain] = 0;
 
-            $this->debug('MX records (' . $domain . '): ' . print_r($mxs, true));
+            $this->debug('MX records ('.$domain.'): '.print_r($mxs, true));
             $this->domains_info[$domain] = array();
             $this->domains_info[$domain]['users'] = $users;
             $this->domains_info[$domain]['mxs'] = $mxs;
@@ -272,8 +272,8 @@ 
                     }
                 } catch (SMTP_Validate_Email_Exception_No_Connection $e) {
                     // unable to connect to host, so these addresses are invalid?
-                    $this->debug('Unable to connect. Exception caught: ' . $e->getMessage());
-                    $this->set_domain_results($users, $domain, $this->no_conn_is_valid );
+                    $this->debug('Unable to connect. Exception caught: '.$e->getMessage());
+                    $this->set_domain_results($users, $domain, $this->no_conn_is_valid);
                 }
             }
 
@@ -284,7 +284,7 @@ 
                     if ($this->helo()) {
 
                         // try issuing MAIL FROM
-                        if (!($this->mail($this->from_user . '@' . $this->from_domain))) {
+                        if (!($this->mail($this->from_user.'@'.$this->from_domain))) {
                             // MAIL FROM not accepted, we can't talk
                             $this->set_domain_results($users, $domain, $this->no_comm_is_valid);
                         }
@@ -316,7 +316,7 @@ 
                                 $this->noop();
                                 // rcpt to for each user
                                 foreach ($users as $user) {
-                                    $address = $user . '@' . $domain;
+                                    $address = $user.'@'.$domain;
                                     $this->results[$address] = $this->rcpt($address);
                                     $this->noop();
                                 }
@@ -378,7 +378,7 @@ 
             $users = (array) $users;
         }
         foreach ($users as $user) {
-            $this->results[$user . '@' . $domain] = $val;
+            $this->results[$user.'@'.$domain] = $val;
         }
     }
 
@@ -398,12 +398,12 @@ 
     * @throws SMTP_Validate_Email_Exception_No_Timeout
     */
     protected function connect($host) {
-        $remote_socket = $host . ':' . $this->connect_port;
+        $remote_socket = $host.':'.$this->connect_port;
         $errnum = 0;
         $errstr = '';
         $this->host = $remote_socket;
         // open connection
-        $this->debug('Connecting to ' . $this->host);
+        $this->debug('Connecting to '.$this->host);
         $this->socket = @stream_socket_client(
             $this->host,
             $errnum,
@@ -414,15 +414,15 @@ 
         );
         // connected?
         if (!$this->connected()) {
-            $this->debug('Connect failed: ' . $errstr . ', error number: ' . $errnum . ', host: ' . $this->host);
-            throw new SMTP_Validate_Email_Exception_No_Connection('Cannot ' .
-            'open a connection to remote host (' . $this->host . ')');
+            $this->debug('Connect failed: '.$errstr.', error number: '.$errnum.', host: '.$this->host);
+            throw new SMTP_Validate_Email_Exception_No_Connection('Cannot '.
+            'open a connection to remote host ('.$this->host.')');
         }
         $result = stream_set_timeout($this->socket, $this->connect_timeout);
         if (!$result) {
             throw new SMTP_Validate_Email_Exception_No_Timeout('Cannot set timeout');
         }
-        $this->debug('Connected to ' . $this->host . ' successfully');
+        $this->debug('Connected to '.$this->host.' successfully');
     }
 
     /**
@@ -435,7 +435,7 @@ 
             $this->quit();
         }
         if ($this->connected()) {
-            $this->debug('Closing socket to ' . $this->host);
+            $this->debug('Closing socket to '.$this->host);
             fclose($this->socket);
         }
         $this->host = null;
@@ -482,7 +482,7 @@ 
             return true;
         } catch (SMTP_Validate_Email_Exception_Unexpected_Response $e) {
             // connected, but recieved an unexpected response, so disconnect
-            $this->debug('Unexpected response after connecting: ' . $e->getMessage());
+            $this->debug('Unexpected response after connecting: '.$e->getMessage());
             $this->disconnect(false);
             return false;
         }
@@ -495,11 +495,11 @@ 
     protected function ehlo() {
         try {
             // modern
-            $this->send('EHLO ' . $this->from_domain);
+            $this->send('EHLO '.$this->from_domain);
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['ehlo']);
         } catch (SMTP_Validate_Email_Exception_Unexpected_Response $e) {
             // legacy
-            $this->send('HELO ' . $this->from_domain);
+            $this->send('HELO '.$this->from_domain);
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['helo']);
         }
     }
@@ -515,7 +515,7 @@ 
             throw new SMTP_Validate_Email_Exception_No_Helo('Need HELO before MAIL FROM');
         }
         // issue MAIL FROM, 5 minute timeout
-        $this->send('MAIL FROM:<' . $from . '>');
+        $this->send('MAIL FROM:<'.$from.'>');
         try {
             $this->expect(self::SMTP_GENERIC_SUCCESS, $this->command_timeouts['mail']);
             // set state flags
@@ -524,7 +524,7 @@ 
             return true;
         } catch (SMTP_Validate_Email_Exception_Unexpected_Response $e) {
             // got something unexpected in response to MAIL FROM
-            $this->debug("Unexpected response to MAIL FROM\n:" . $e->getMessage());
+            $this->debug("Unexpected response to MAIL FROM\n:".$e->getMessage());
             // hotmail has been known to do this + was closing the connection
             // forcibly on their end, so we're killing the socket here too
             $this->disconnect(false);
@@ -553,17 +553,17 @@ 
         }
         // issue RCPT TO, 5 minute timeout
         try {
-            $this->send('RCPT TO:<' . $to . '>');
+            $this->send('RCPT TO:<'.$to.'>');
             // process the response
             try {
                 $this->expect($expected_codes, $this->command_timeouts['rcpt']);
                 $this->state['rcpt'] = true;
                 $is_valid = true;
             } catch (SMTP_Validate_Email_Exception_Unexpected_Response $e) {
-                $this->debug('Unexpected response to RCPT TO: ' . $e->getMessage());
+                $this->debug('Unexpected response to RCPT TO: '.$e->getMessage());
             }
         } catch (SMTP_Validate_Email_Exception $e) {
-            $this->debug('Sending RCPT TO failed: ' . $e->getMessage());
+            $this->debug('Sending RCPT TO failed: '.$e->getMessage());
         }
         return $is_valid;
     }
@@ -595,7 +595,7 @@ 
         // although RFC says QUIT can be issued at any time, we won't
         if ($this->state['helo']) {
             $this->send('QUIT');
-            $this->expect(array(self::SMTP_GENERIC_SUCCESS,self::SMTP_QUIT_SUCCESS), $this->command_timeouts['quit'], true);
+            $this->expect(array(self::SMTP_GENERIC_SUCCESS, self::SMTP_QUIT_SUCCESS), $this->command_timeouts['quit'], true);
         }
     }
 
@@ -631,13 +631,13 @@ 
         if (!$this->connected()) {
             throw new SMTP_Validate_Email_Exception_No_Connection('No connection');
         }
-        $this->debug('send>>>: ' . $cmd);
+        $this->debug('send>>>: '.$cmd);
         // write the cmd to the connection stream
-        $result = fwrite($this->socket, $cmd . self::CRLF);
+        $result = fwrite($this->socket, $cmd.self::CRLF);
         // did the send work?
         if ($result === false) {
-            throw new SMTP_Validate_Email_Exception_Send_Failed('Send failed ' .
-            'on: ' . $this->host);
+            throw new SMTP_Validate_Email_Exception_Send_Failed('Send failed '.
+            'on: '.$this->host);
         }
         return $result;
     }
@@ -660,7 +660,7 @@ 
         }
         // retrieve response
         $line = fgets($this->socket, 1024);
-        $this->debug('<<<recv: ' . $line);
+        $this->debug('<<<recv: '.$line);
         // have we timed out?
         $info = stream_get_meta_data($this->socket);
         if (!empty($info['timed_out'])) {
@@ -704,7 +704,7 @@ 
             // no response in expect() probably means that the
             // remote server forcibly closed the connection so
             // lets clean up on our end as well?
-            $this->debug('No response in expect(): ' . $e->getMessage());
+            $this->debug('No response in expect(): '.$e->getMessage());
             $this->disconnect(false);
 
         }
@@ -720,7 +720,7 @@ 
     protected function parse_email($email) {
         $parts = explode('@', $email);
         $domain = array_pop($parts);
-        $user= implode('@', $parts);
+        $user = implode('@', $parts);
         return array($user, $domain);
     }
 
@@ -789,9 +789,9 @@ 
         if (empty($hostname)) {
             return null;
         }
-        $cmd = 'nslookup -type=MX ' . escapeshellarg($hostname);
+        $cmd = 'nslookup -type=MX '.escapeshellarg($hostname);
         if (!empty($this->mx_query_ns)) {
-            $cmd .= ' ' . escapeshellarg($this->mx_query_ns);
+            $cmd .= ' '.escapeshellarg($this->mx_query_ns);
         }
         exec($cmd, $output);
         if (empty($output)) {
@@ -823,9 +823,9 @@ 
         $this->log($str);
         if ($this->debug == true) {
             if (PHP_SAPI != 'cli') {
-                $str = '<br/><pre>' . htmlspecialchars($str) . '</pre>';
+                $str = '<br/><pre>'.htmlspecialchars($str).'</pre>';
             }
-            echo "\n" . $str;
+            echo "\n".$str;
         }
     }
 
@@ -846,7 +846,7 @@ 
      */
     private function stamp($msg) {
         $date = \DateTime::createFromFormat('U.u', sprintf('%.f', microtime(true)))->format('Y-m-d\TH:i:s.uO');
-        $line = '[' . $date . '] ' . $msg;
+        $line = '['.$date.'] '.$msg;
 
         return $line;
     }