Inspection of "fix mysqli_fetch_array bug for php7 support" - mikelynn2/blacklistmonitor - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 15bbb1...ec3fdd )

by mike

created 2016-07-13 02:06 UTC

Status

Doc Comments +8 added lines patch added patch discarded remove patch

@@ -39,6 +39,10 @@  discard block
 block discarded – undo
 	//     $key: The cache key.
 	// Returns:
 	//     The object which was previously stored, or false if a cache miss occurred.
+
+	/**
+	 * @param string $key
+	 */
 	public function get($key) {
 //return false;
 		if (($this->cleanInterval == 1) ||
@@ -59,6 +63,10 @@  discard block
 block discarded – undo
 	// Parameters:
 	//     $key: The cache key.
 	//     $value: The object to store.
+
+	/**
+	 * @param string $key
+	 */
 	public function set($key, $value) {
 		if (($this->cleanInterval == 1) ||
 			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 		if ($cleanInterval < 1) $cleanInterval = 1;
 		$this->cleanInterval = (int)$cleanInterval;
 
-		if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
+		if ($directoryDepth < 1) $directoryDepth = 1; else if ($directoryDepth > 10) $directoryDepth = 10;
 		$this->directoryDepth = (int)$directoryDepth;
 	}
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
 	//     The object which was previously stored, or false if a cache miss occurred.
 	public function get($key) {
 //return false;
-		if (($this->cleanInterval == 1) ||
-			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {
+		if (($this->cleanInterval==1) ||
+			(rand(1, $this->cleanInterval)==$this->cleanInterval)) {
 			$this->clean();
 		}
 		$val = false;
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
 	//     $key: The cache key.
 	//     $value: The object to store.
 	public function set($key, $value) {
-		if (($this->cleanInterval == 1) ||
-			(rand(1, $this->cleanInterval) == $this->cleanInterval)) {
+		if (($this->cleanInterval==1) ||
+			(rand(1, $this->cleanInterval)==$this->cleanInterval)) {
 			$this->clean();
 		}
 		$fn = $this->getCacheFilename($key, true);
-		$fileData = file_put_contents($fn,serialize($value));
+		$fileData = file_put_contents($fn, serialize($value));
 	}
 
 	// Delete an object from the cache.
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
 		foreach (@glob($path.'/*', GLOB_NOSORT) as $fn) {
 			if (@is_dir($fn)) {
 				$this->cleanPath($fn);
-			} else if (@filemtime($fn) <= $exptime) {
+			}else if (@filemtime($fn) <= $exptime) {
 				@unlink($fn);
 			}
 		}
-		if ($path != $this->path) {
+		if ($path!=$this->path) {
 			@rmdir($path);
 		}
 	}
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
 	}
 
 	public function fixPermissions($user) {
-		$cmd = escapeshellcmd('chown -R '.$user.':'.$user. ' ' . $this->path);
+		$cmd = escapeshellcmd('chown -R '.$user.':'.$user.' '.$this->path);
 		exec($cmd);
 	}
 

Please login to merge, or discard this patch.

Braces +17 added lines, -5 removed lines patch added patch discarded remove patch

@@ -24,13 +24,21 @@  discard block
 block discarded – undo
 
 		$this->path = '/tmp/_FileCache_/'.(string)$path;
 
-		if ($expirationTimeInSeconds < 1) $expirationTimeInSeconds = 1;
+		if ($expirationTimeInSeconds < 1) {
+			$expirationTimeInSeconds = 1;
+		}
 		$this->expirationTimeInSeconds = (int)$expirationTimeInSeconds;
 
-		if ($cleanInterval < 1) $cleanInterval = 1;
+		if ($cleanInterval < 1) {
+			$cleanInterval = 1;
+		}
 		$this->cleanInterval = (int)$cleanInterval;
 
-		if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
+		if ($directoryDepth<1) {
+			$directoryDepth=1;
+		} else if ($directoryDepth>10) {
+			$directoryDepth=10;
+		}
 		$this->directoryDepth = (int)$directoryDepth;
 	}
 
@@ -80,7 +88,9 @@  discard block
 block discarded – undo
 			$refPath = rtrim($this->path, "/\\");
 			$dir = rtrim(dirname($fn), "/\\");
 			for ($i = 0; $i < $this->directoryDepth; $i++) {
-				if (!@rmdir($dir)) break;
+				if (!@rmdir($dir)) {
+					break;
+				}
 				$dir = rtrim(dirname($dir), "/\\");
 			}
 		}
@@ -112,7 +122,9 @@  discard block
 block discarded – undo
 		for ($i = 0, $idx = 0; $i < $this->directoryDepth; $i++, $idx += 2) {
 			$path .= '/'.substr($hash, $idx, 2);
 		}
-		if ($autoCreateDirectory) @mkdir($path, 0777, true);
+		if ($autoCreateDirectory) {
+			@mkdir($path, 0777, true);
+		}
 		$path .= '/'.$hash;
 		return $path;
 	}

Please login to merge, or discard this patch.

classes/class.smtp.php 3 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -929,7 +929,7 @@
 block discarded – undo
      * 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)
     {

Please login to merge, or discard this patch.

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -227,7 +227,7 @@  discard block
 block discarded – undo
             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,14 +274,14 @@  discard block
 block discarded – undo
             $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,
                 STREAM_CLIENT_CONNECT,
                 $socket_context
             );
-        } else {
+        }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",
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
                 $errstr
             );
             $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
+                'SMTP ERROR: '.$this->error['error']
                 . ": $errstr ($errno)",
                 self::DEBUG_CLIENT
             );
@@ -312,17 +312,17 @@  discard block
 block discarded – undo
         $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') {
+        if (substr(PHP_OS, 0, 3)!='WIN') {
             $max = ini_get('max_execution_time');
             // Don't bother if unlimited
-            if ($max != 0 && $timeout > $max) {
+            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);
+        $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
         return true;
     }
 
@@ -381,9 +381,9 @@  discard block
 block discarded – undo
                 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
             );
 
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
                 // Send encoded username and password
                 if (!$this->sendCommand(
                     'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
+                    base64_encode("\0".$username."\0".$password),
                     235
                 )
                 ) {
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
 
                 if (!$this->sendCommand(
                     'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
+                    'AUTH NTLM '.base64_encode($msg1),
                     334
                 )
                 ) {
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
                 $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);
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
         $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)));
     }
 
     /**
@@ -622,13 +622,13 @@  discard block
 block discarded – undo
 
         $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;
         }
 
         foreach ($lines as $line) {
             $lines_out = array();
-            if ($in_headers and $line == '') {
+            if ($in_headers and $line=='') {
                 $in_headers = false;
             }
             //Break this line up into several smaller lines if it's too long
@@ -640,18 +640,18 @@  discard block
 block discarded – undo
                 //Deliberately matches both false and 0
                 if (!$pos) {
                     //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $pos = self::MAX_LINE_LENGTH-1;
                     $lines_out[] = substr($line, 0, $pos);
                     $line = substr($line, $pos);
-                } else {
+                }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);
+                    $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;
+                    $line = "\t".$line;
                 }
             }
             $lines_out[] = $line;
@@ -659,17 +659,17 @@  discard block
 block discarded – undo
             //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);
             }
         }
 
         //Message data has been sent, complete the command
         //Increase timelimit for end of DATA command
         $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
+        $this->Timelimit = $this->Timelimit*2;
         $result = $this->sendCommand('DATA END', '.', 250);
         //Restore timelimit
         $this->Timelimit = $savetimelimit;
@@ -703,11 +703,11 @@  discard block
 block discarded – undo
      */
     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);
-        } else {
+        }else {
             $this->server_caps = null;
         }
         return $noerror;
@@ -733,9 +733,9 @@  discard block
 block discarded – undo
                 if (!$n) {
                     $name = $type;
                     $fields = $fields[0];
-                } else {
+                }else {
                     $name = array_shift($fields);
-                    if ($name == 'SIZE') {
+                    if ($name=='SIZE') {
                         $fields = ($fields) ? $fields[0] : 0;
                     }
                 }
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
         $useVerp = ($this->do_verp ? ' XVERP' : '');
         return $this->sendCommand(
             'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
+            'MAIL FROM:<'.$from.'>'.$useVerp,
             250
         );
     }
@@ -797,7 +797,7 @@  discard block
 block discarded – undo
     {
         return $this->sendCommand(
             'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
+            'RCPT TO:<'.$toaddr.'>',
             array(250, 251)
         );
     }
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
             $this->setError("Called $command without being connected");
             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
@@ -842,14 +842,14 @@  discard block
 block discarded – undo
                 '',
                 $this->last_reply
             );
-        } else {
+        }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);
+        $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
 
         if (!in_array($code, (array)$expect)) {
             $this->setError(
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
                 $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;
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
     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;
     }
 
@@ -985,10 +985,10 @@  discard block
 block discarded – undo
 
         // the tight logic knot ;)
         if (!array_key_exists($name, $this->server_caps)) {
-            if ($name == 'HELO') {
+            if ($name=='HELO') {
                 return $this->server_caps['EHLO'];
             }
-            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+            if ($name=='EHLO' || array_key_exists('EHLO', $this->server_caps)) {
                 return false;
             }
             $this->setError('HELO handshake was used. Client knows nothing about server extensions');
@@ -1027,7 +1027,7 @@  discard block
 block discarded – undo
         $endtime = 0;
         stream_set_timeout($this->smtp_conn, $this->Timeout);
         if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
+            $endtime = time()+$this->Timelimit;
         }
         while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
             $str = @fgets($this->smtp_conn, 515);
@@ -1036,14 +1036,14 @@  discard block
 block discarded – undo
             $data .= $str;
             $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
             // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
+            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)',
+                    'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
             if ($endtime and time() > $endtime) {
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
+                    $this->Timelimit.' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;

Please login to merge, or discard this patch.

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

@@ -26,418 +26,418 @@  discard block
 block discarded – undo
  */
 class SMTP
 {
-    /**
-     * The PHPMailer SMTP version number.
-     * @type string
-     */
-    const VERSION = '5.2.10';
-
-    /**
-     * SMTP line break constant.
-     * @type string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @type integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type 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.
-     * @type string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.10';
-
-    /**
-     * SMTP server port number.
-     * @type 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.
-     * @type 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
-     * @type 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>
-     * @type 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
-     * @type 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
-     * @type 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
-     * @type integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @type resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error information, if any, for the last SMTP command.
-     * @type 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.
-     * @type 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.
-     * @type array|null
-     */
-    protected $server_caps = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @type 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)
-     * @param string $realm       The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @access public
-     * @return boolean True if successfully authenticated.
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = null,
-        $realm = '',
-        $workstation = ''
-    ) {
-        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', 'NTLM', '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 'NTLM':
-                /*
+	/**
+	 * The PHPMailer SMTP version number.
+	 * @type string
+	 */
+	const VERSION = '5.2.10';
+
+	/**
+	 * SMTP line break constant.
+	 * @type string
+	 */
+	const CRLF = "\r\n";
+
+	/**
+	 * The SMTP port to use if one is not specified.
+	 * @type integer
+	 */
+	const DEFAULT_SMTP_PORT = 25;
+
+	/**
+	 * The maximum line length allowed by RFC 2822 section 2.1.1
+	 * @type 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.
+	 * @type string
+	 * @deprecated Use the `VERSION` constant instead
+	 * @see SMTP::VERSION
+	 */
+	public $Version = '5.2.10';
+
+	/**
+	 * SMTP server port number.
+	 * @type 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.
+	 * @type 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
+	 * @type 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>
+	 * @type 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
+	 * @type 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
+	 * @type 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
+	 * @type integer
+	 */
+	public $Timelimit = 300;
+
+	/**
+	 * The socket for the server connection.
+	 * @type resource
+	 */
+	protected $smtp_conn;
+
+	/**
+	 * Error information, if any, for the last SMTP command.
+	 * @type 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.
+	 * @type 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.
+	 * @type array|null
+	 */
+	protected $server_caps = null;
+
+	/**
+	 * The most recent reply received from the server.
+	 * @type 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)
+	 * @param string $realm       The auth realm for NTLM
+	 * @param string $workstation The auth workstation for NTLM
+	 * @access public
+	 * @return boolean True if successfully authenticated.
+	 */
+	public function authenticate(
+		$username,
+		$password,
+		$authtype = null,
+		$realm = '',
+		$workstation = ''
+	) {
+		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', 'NTLM', '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 'NTLM':
+				/*
                  * ntlm_sasl_client.php
                  * Bundled with Permission
                  *
@@ -445,166 +445,166 @@  discard block
 block discarded – undo
                  * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
                  * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
                  */
-                require_once 'extras/ntlm_sasl_client.php';
-                $temp = new stdClass;
-                $ntlm_client = new ntlm_sasl_client_class;
-                //Check that functions are available
-                if (!$ntlm_client->Initialize($temp)) {
-                    $this->setError($temp->error);
-                    $this->edebug(
-                        'You need to enable some modules in your php.ini file: '
-                        . $this->error['error'],
-                        self::DEBUG_CLIENT
-                    );
-                    return false;
-                }
-                //msg1
-                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
-
-                if (!$this->sendCommand(
-                    'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
-                    334
-                )
-                ) {
-                    return false;
-                }
-                //Though 0 based, there is a white space after the 3 digit number
-                //msg2
-                $challenge = substr($this->last_reply, 3);
-                $challenge = base64_decode($challenge);
-                $ntlm_res = $ntlm_client->NTLMResponse(
-                    substr($challenge, 24, 8),
-                    $password
-                );
-                //msg3
-                $msg3 = $ntlm_client->TypeMsg3(
-                    $ntlm_res,
-                    $username,
-                    $realm,
-                    $workstation
-                );
-                // send encoded username
-                return $this->sendCommand('Username', base64_encode($msg3), 235);
-            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!
+				require_once 'extras/ntlm_sasl_client.php';
+				$temp = new stdClass;
+				$ntlm_client = new ntlm_sasl_client_class;
+				//Check that functions are available
+				if (!$ntlm_client->Initialize($temp)) {
+					$this->setError($temp->error);
+					$this->edebug(
+						'You need to enable some modules in your php.ini file: '
+						. $this->error['error'],
+						self::DEBUG_CLIENT
+					);
+					return false;
+				}
+				//msg1
+				$msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
+
+				if (!$this->sendCommand(
+					'AUTH NTLM',
+					'AUTH NTLM ' . base64_encode($msg1),
+					334
+				)
+				) {
+					return false;
+				}
+				//Though 0 based, there is a white space after the 3 digit number
+				//msg2
+				$challenge = substr($this->last_reply, 3);
+				$challenge = base64_decode($challenge);
+				$ntlm_res = $ntlm_client->NTLMResponse(
+					substr($challenge, 24, 8),
+					$password
+				);
+				//msg3
+				$msg3 = $ntlm_client->TypeMsg3(
+					$ntlm_res,
+					$username,
+					$realm,
+					$workstation
+				);
+				// send encoded username
+				return $this->sendCommand('Username', base64_encode($msg3), 235);
+			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.
@@ -612,541 +612,541 @@  discard block
 block discarded – undo
          * 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) {
-            $s = trim(substr($s, 4));
-            if (!$s) {
-                continue;
-            }
-            $fields = explode(' ', $s);
-            if (!empty($fields)) {
-                if (!$n) {
-                    $name = $type;
-                    $fields = $fields[0];
-                } else {
-                    $name = array_shift($fields);
-                    if ($name == 'SIZE') {
-                        $fields = ($fields) ? $fields[0] : 0;
-                    }
-                }
-                $this->server_caps[$name] = ($fields ? $fields : true);
-            }
-        }
-    }
-
-    /**
-     * 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 $toaddr The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($toaddr)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
-            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;
-        }
-        $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 was \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            // 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) {
+			$s = trim(substr($s, 4));
+			if (!$s) {
+				continue;
+			}
+			$fields = explode(' ', $s);
+			if (!empty($fields)) {
+				if (!$n) {
+					$name = $type;
+					$fields = $fields[0];
+				} else {
+					$name = array_shift($fields);
+					if ($name == 'SIZE') {
+						$fields = ($fields) ? $fields[0] : 0;
+					}
+				}
+				$this->server_caps[$name] = ($fields ? $fields : true);
+			}
+		}
+	}
+
+	/**
+	 * 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 $toaddr The address the message is being sent to
+	 * @access public
+	 * @return boolean
+	 */
+	public function recipient($toaddr)
+	{
+		return $this->sendCommand(
+			'RCPT TO',
+			'RCPT TO:<' . $toaddr . '>',
+			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;
+		}
+		$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 was \"$data\"", self::DEBUG_LOWLEVEL);
+			$this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
+			$data .= $str;
+			$this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+			// 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;
+	}
 }
\ No newline at end of file

Please login to merge, or discard this patch.

classes/Utilities.class.php 3 patches

Doc Comments +22 added lines patch added patch discarded remove patch

		@@ -174,6 +174,10 @@ discard block
		block discarded – undo
174	174	return trim($test);
175	175	}
176	176
	177	+ /**
	178	+ * @param string $monitorType
	179	+ * @param boolean $isBlocked
	180	+ */
177	181	public static function logBlockListStats($server, $monitorType, $isBlocked){
178	182	if(Setup::$settings['log_rbl_stats']==0) return true;
179	183	$mysql = new _MySQL();
		@@ -403,6 +407,12 @@ discard block
		block discarded – undo
403	407	);
404	408	}
405	409
	410	+ /**
	411	+ * @param string $host
	412	+ * @param boolean $isBlocked
	413	+ * @param string $rDNS
	414	+ * @param string $status
	415	+ */
406	416	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
407	417	if(substr($url,0,4)!='http') return false;
408	418
		@@ -438,6 +448,10 @@ discard block
		block discarded – undo
438	448	return false;
439	449	}
440	450
	451	+ /**
	452	+ * @param string $beginText
	453	+ * @param string $endText
	454	+ */
441	455	public static function parseBetweenText(
442	456	$text,
443	457	$beginText,
		@@ -471,6 +485,11 @@ discard block
		block discarded – undo
471	485	return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
472	486	}
473	487
	488	+ /**
	489	+ * @param _MySQL $mysql
	490	+ *
	491	+ * @return string
	492	+ */
474	493	public static function getNextMonitor($mysql){
475	494	$ipDomain = $mysql->runQueryReturnVar("select ipDomain from monitors where beenChecked = 0");
476	495	$mysql->runQuery("update monitors set beenChecked = 1 where ipDomain = '".$mysql->escape($ipDomain)."'");
		@@ -518,6 +537,9 @@ discard block
		block discarded – undo
518	537	}
519	538	}
520	539
	540	+ /**
	541	+ * @param string $command
	542	+ */
521	543	public static function run_in_background($command, $priority = 0) {
522	544	$log = Setup::$settings['log_path'];
523	545	if($priority !=0){

Please login to merge, or discard this patch.

Braces +93 added lines, -40 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 		while($row = mysqli_fetch_array($rs, MYSQL_ASSOC)){
 			if($row['monitorType']=='ip'){
 				$cacheData['ips'][] = $row['host'];
-			}else{
+			} else{
 				$cacheData['domains'][] = $row['host'];
 			}
 		}
@@ -58,20 +58,20 @@  discard block
 block discarded – undo
 				if($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'ip', true);
-				}else{
+				} else{
 					self::logBlockListStats($server, 'ip', false);
 				}
 				if($r!='' || $reportClean==true) {
 					$return[] = array(trim($server),$r);
 				}
 			}
-		}else{
+		} else{
 			foreach(self::$domainBlacklists as $server){
 				$r = self::domainCheck($domainOrIp, $server);
 				if($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'domain', true);
-				}else{
+				} else{
 					self::logBlockListStats($server, 'domain', false);
 				}
 				if($r!='' || $reportClean==true) {
@@ -113,17 +113,23 @@  discard block
 block discarded – undo
 				$testArray = explode("\t", $test);
 				$test = end($testArray);
 				$test = str_replace(array('\'','"'),'',$test);
-			}else{
+			} else{
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if(strripos($test,'not found')!==false) {
+			return '';
+		}
+		if(strripos($test,'SERVFAIL')!==false) {
+			return '';
+		}
 		return trim($test);
 	}
 
 	public static function ipCheck($ip, $server){
-		if(_IpAddresses::isIPAddress($ip)===false) return '';
+		if(_IpAddresses::isIPAddress($ip)===false) {
+			return '';
+		}
 		$server = trim($server);
 
 		$parts = explode('.', $ip);
@@ -164,23 +170,31 @@  discard block
 block discarded – undo
 						$test = (isset($a[1])) ? 'Listed ' . $a[1] : $test2;
 					break;
 				}
-				if($test2!='') $test = $test2;
-			}else{
+				if($test2!='') {
+					$test = $test2;
+				}
+			} else{
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if(strripos($test,'not found')!==false) {
+			return '';
+		}
+		if(strripos($test,'SERVFAIL')!==false) {
+			return '';
+		}
 		return trim($test);
 	}
 
 	public static function logBlockListStats($server, $monitorType, $isBlocked){
-		if(Setup::$settings['log_rbl_stats']==0) return true;
+		if(Setup::$settings['log_rbl_stats']==0) {
+			return true;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		if($isBlocked){
 			$sql = "update blockLists set blocksToday=(blocksToday+1), lastBlockReport=now() where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
-		}else{
+		} else{
 			$sql = "update blockLists set cleanToday=(cleanToday+1) where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
 		}
 		$mysql->runQuery($sql);
@@ -202,7 +216,9 @@  discard block
 block discarded – undo
 	public static function updateDomains($domains, $monitorGroupId){
 		$domains = trim($domains);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if($monitorGroupId===0) {
+			return false;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 1 and monitorGroupId = $monitorGroupId");
@@ -241,7 +257,9 @@  discard block
 block discarded – undo
 	public static function updateIPs($ips, $monitorGroupId){
 		$ips = trim($ips);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if($monitorGroupId===0) {
+			return false;
+		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 0 and monitorGroupId = $monitorGroupId");
@@ -267,16 +285,25 @@  discard block
 block discarded – undo
 						keepOnUpdate = 1
 						");
 				}
-			}else{
+			} else{
 				//cidr /24's max...
 				if(trim($i)!=''){
-					if(strpos($i, ' ')!==false) continue;
-					if(strpos($i, ':')!==false) continue;
+					if(strpos($i, ' ')!==false) {
+						continue;
+					}
+					if(strpos($i, ':')!==false) {
+						continue;
+					}
 					$range = _IpAddresses::cidrToRange($i);
-					if($range===false) continue;
+					if($range===false) {
+						continue;
+					}
 					$start = explode('.', $range[0]);
 					$end = explode('.', $range[1]);
-					if($range[0]==0) continue;// starts with 0
+					if($range[0]==0) {
+						continue;
+					}
+					// starts with 0
 					for($i = $start[3]; $i <= $end[3]; $i++){
 						$host = "{$start[0]}.{$start[1]}.{$start[2]}.$i";
 						if(_IpAddresses::isIPAddress($host)){
@@ -308,7 +335,7 @@  discard block
 block discarded – undo
 	public static function isLoggedIn(){
 		if(isset($_SESSION['id']) && (int)$_SESSION['id'] > 0){
 			return $_SESSION['id'];
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -353,7 +380,7 @@  discard block
 block discarded – undo
 		where ";
 		if(trim($apiKey) != ''){
 			$sql .= " apiKey = '".$mysql->escape($apiKey)."'";
-		}else{
+		} else{
 			$sql .= " passwd = '".$mysql->escape(md5($passwd))."' 
 			and username = '".$mysql->escape($userName)."'";
 		}
@@ -369,12 +396,12 @@  discard block
 block discarded – undo
 	public static function lookupHostDNS($host){
 		if(_IpAddresses::isIPAddress($host)){
 			return _IpAddresses::getHostByIp($host);
-		}else{
+		} else{
 			$host = escapeshellarg($host);
 			exec('host -t a -W 2 '.$host, $output, $return);
 			if ($return !== 0) {
 				return '';
-			}else{
+			} else{
 				$output = implode($output);
 				$ips = _IpAddresses::getAllIPsFromString($output, true);
 				$ir = "";
@@ -404,7 +431,9 @@  discard block
 block discarded – undo
 	}
 
 	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
-		if(substr($url,0,4)!='http') return false;
+		if(substr($url,0,4)!='http') {
+			return false;
+		}
 
 		$vars = json_encode(
 			array(
@@ -424,7 +453,9 @@  discard block
 block discarded – undo
 			curl_setopt($ch,CURLOPT_POSTFIELDS,$vars);
 			curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
 			curl_exec($ch);
-			if (curl_errno($ch)) $err = false;
+			if (curl_errno($ch)) {
+				$err = false;
+			}
 		} catch (Exception $e) {
 			$err = false;
 		}
@@ -449,10 +480,14 @@  discard block
 block discarded – undo
 		$endPos = 0;
 		while(true) {
 				$beginPos = stripos($text, $beginText, $endPos);
-				if($beginPos===false) break;
+				if($beginPos===false) {
+					break;
+				}
 				$beginPos = $beginPos+strlen($beginText);
 				$endPos = stripos($text, $endText, $beginPos);
-				if($endPos===false) break;
+				if($endPos===false) {
+					break;
+				}
 				$result = substr($text, $beginPos, $endPos-$beginPos);
 				if($removeSpace){
 						$result = str_replace("\t","",$result);
@@ -465,8 +500,12 @@  discard block
 block discarded – undo
 				if($removeHtmlTags){
 						$result = strip_tags($result);
 				}
-				if($firstResultOnlyNoArray) return $result;
-				if($result != '') $results[] = $result;
+				if($firstResultOnlyNoArray) {
+					return $result;
+				}
+				if($result != '') {
+					$results[] = $result;
+				}
 		}
 		return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
 	 }
@@ -480,40 +519,54 @@  discard block
 block discarded – undo
 	public static function getHostChangeCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where lastStatusChanged = 1 $sql");
 	}
 
 	public static function getHostErrorCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
+		if($onlyNew) {
+			$sql .= " and lastStatusChanged = 1 ";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 1 $sql");
 	}
 
 	public static function getHostCleanCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if($monitorGroupId > 0) {
+			$sql = " and monitorGroupId = $monitorGroupId";
+		}
+		if($onlyNew) {
+			$sql .= " and lastStatusChanged = 1 ";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 0 $sql");
 	}
 
 	public static function getHostCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
+		if($monitorGroupId > 0) {
+			$sql = " where monitorGroupId = $monitorGroupId";
+		}
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors $sql");
 	}
 
 	//CREDIT: http://braincrafted.com/php-background-processes/
 	public static function is_process_running($pid){
 		$pid = (int)$pid;
-		if($pid == 0) return false;
+		if($pid == 0) {
+			return false;
+		}
 		if(file_exists('/proc/'.$pid)){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -522,7 +575,7 @@  discard block
 block discarded – undo
 		$log = Setup::$settings['log_path'];
 		if($priority !=0){
 			$pid = shell_exec("nohup nice -n $priority $command >> $log 2>&1 & echo $!");
-		}else{
+		} else{
 			$pid = shell_exec("nohup $command >> $log 2>&1 & echo $!");
 		}
 		return($pid);

Please login to merge, or discard this patch.

Spacing +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -12,12 +12,12 @@  discard block
 block discarded – undo
 	public static $frequencyCheckOptions = array('1hour', '2hour', '8hour', 'daily', 'weekly');
 	public static $mysql = false;
 
-	public static function setBlockLists(){
+	public static function setBlockLists() {
 		$localCache = new _FileCache('blacklistmonitor-Utilities-BlockLists', 60);
 		$cacheKey = 'bl';
 		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
-			if(isset($cacheData['domains']) && isset($cacheData['ips']) ) {
+		if ($cacheData!==false) {
+			if (isset($cacheData['domains']) && isset($cacheData['ips'])) {
 				self::$domainBlacklists = $cacheData['domains'];
 				self::$ipBlacklists = $cacheData['ips'];
 				return true;
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
 		$rs = $mysql->runQuery($sql);
 		$cacheData['domains'] = array();
 		$cacheData['ips'] = array();
-		while($row = mysqli_fetch_array($rs)){
-			if($row['monitorType']=='ip'){
+		while ($row = mysqli_fetch_array($rs)) {
+			if ($row['monitorType']=='ip') {
 				$cacheData['ips'][] = $row['host'];
-			}else{
+			}else {
 				$cacheData['domains'][] = $row['host'];
 			}
 		}
@@ -43,46 +43,46 @@  discard block
 block discarded – undo
 		return false;
 	}
 
-	public static function randomDNSServer(){
-		return Setup::$settings['dns_servers'][mt_rand(0,(count(Setup::$settings['dns_servers'])-1))];
+	public static function randomDNSServer() {
+		return Setup::$settings['dns_servers'][mt_rand(0, (count(Setup::$settings['dns_servers'])-1))];
 	}
 
 	public static $isBlocked = 0;
 	
-	public static function checkBlacklists($domainOrIp, $reportClean=false){
+	public static function checkBlacklists($domainOrIp, $reportClean = false) {
 		self::$isBlocked = 0;
 		$return = array();
-		if(_IpAddresses::isIPAddress($domainOrIp)){
-			foreach(self::$ipBlacklists as $server){
+		if (_IpAddresses::isIPAddress($domainOrIp)) {
+			foreach (self::$ipBlacklists as $server) {
 				$r = self::ipCheck($domainOrIp, $server);
-				if($r!='') {
+				if ($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'ip', true);
-				}else{
+				}else {
 					self::logBlockListStats($server, 'ip', false);
 				}
-				if($r!='' || $reportClean==true) {
-					$return[] = array(trim($server),$r);
+				if ($r!='' || $reportClean==true) {
+					$return[] = array(trim($server), $r);
 				}
 			}
-		}else{
-			foreach(self::$domainBlacklists as $server){
+		}else {
+			foreach (self::$domainBlacklists as $server) {
 				$r = self::domainCheck($domainOrIp, $server);
-				if($r!='') {
+				if ($r!='') {
 					self::$isBlocked = 1;
 					self::logBlockListStats($server, 'domain', true);
-				}else{
+				}else {
 					self::logBlockListStats($server, 'domain', false);
 				}
-				if($r!='' || $reportClean==true) {
-					$return[] = array(trim($server),$r);
+				if ($r!='' || $reportClean==true) {
+					$return[] = array(trim($server), $r);
 				}
 			}
 		}
 		return $return;
 	}
 
-	public static function domainCheck($domain, $server){
+	public static function domainCheck($domain, $server) {
 		$server = trim($server);
 		$host = escapeshellarg("$domain.$server");
 		$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host";
@@ -98,8 +98,8 @@  discard block
 block discarded – undo
 		$testArray = explode("\t", $test);
 		$test = end($testArray);
 
-		if(trim($test)!=''){
-			if(Setup::$settings['rbl_txt_extended_status']){
+		if (trim($test)!='') {
+			if (Setup::$settings['rbl_txt_extended_status']) {
 				$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host txt";
 		//		echo("$t</br>");
 				$text = shell_exec($t);
@@ -112,18 +112,18 @@  discard block
 block discarded – undo
 					true);
 				$testArray = explode("\t", $test);
 				$test = end($testArray);
-				$test = str_replace(array('\'','"'),'',$test);
-			}else{
+				$test = str_replace(array('\'', '"'), '', $test);
+			}else {
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if (strripos($test, 'not found')!==false) return '';
+		if (strripos($test, 'SERVFAIL')!==false) return '';
 		return trim($test);
 	}
 
-	public static function ipCheck($ip, $server){
-		if(_IpAddresses::isIPAddress($ip)===false) return '';
+	public static function ipCheck($ip, $server) {
+		if (_IpAddresses::isIPAddress($ip)===false) return '';
 		$server = trim($server);
 
 		$parts = explode('.', $ip);
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
 		$testArray = preg_split("/IN\s+A\s+/i", $test);
 		$test = trim(end($testArray));
 		//		echo "<pre>$test</pre>\n";
-		if(trim($test)!=''){
-			if(Setup::$settings['rbl_txt_extended_status']){
+		if (trim($test)!='') {
+			if (Setup::$settings['rbl_txt_extended_status']) {
 				$t = "dig @".self::randomDNSServer()." +time=".Setup::$settings['dns_request_timeout']." $host txt";
 		//		echo("$t</br>");
 				$text = shell_exec($t);
@@ -157,41 +157,41 @@  discard block
 block discarded – undo
 					true);
 				$testArray = preg_split("/IN\s+TXT\s+/i", $test2);
 				$test2 = trim(end($testArray));
-				$test2 = str_replace(array('\'','"'),'',$test2);
-				switch($server){
+				$test2 = str_replace(array('\'', '"'), '', $test2);
+				switch ($server) {
 					case 'bl.mailspike.net':
-						$a = explode("|",$test2);
-						$test = (isset($a[1])) ? 'Listed ' . $a[1] : $test2;
+						$a = explode("|", $test2);
+						$test = (isset($a[1])) ? 'Listed '.$a[1] : $test2;
 					break;
 				}
-				if($test2!='') $test = $test2;
-			}else{
+				if ($test2!='') $test = $test2;
+			}else {
 				$test = 'blocked';
 			}
 		}
-		if(strripos($test,'not found')!==false) return '';
-		if(strripos($test,'SERVFAIL')!==false) return '';
+		if (strripos($test, 'not found')!==false) return '';
+		if (strripos($test, 'SERVFAIL')!==false) return '';
 		return trim($test);
 	}
 
-	public static function logBlockListStats($server, $monitorType, $isBlocked){
-		if(Setup::$settings['log_rbl_stats']==0) return true;
+	public static function logBlockListStats($server, $monitorType, $isBlocked) {
+		if (Setup::$settings['log_rbl_stats']==0) return true;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
-		if($isBlocked){
+		if ($isBlocked) {
 			$sql = "update blockLists set blocksToday=(blocksToday+1), lastBlockReport=now() where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
-		}else{
+		}else {
 			$sql = "update blockLists set cleanToday=(cleanToday+1) where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
 		}
 		$mysql->runQuery($sql);
 		$mysql->close();
 	}
 
-	public static function ensureGroupExists($groupName){
+	public static function ensureGroupExists($groupName) {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$id = $mysql->runQueryReturnVar("select id from monitorGroup where groupName = '".$mysql->escape($groupName)."'");
-		if($id===false){
+		if ($id===false) {
 			$mysql->runQuery("insert into monitorGroup set groupName = '".$mysql->escape($groupName)."'");
 			$id = $mysql->identity;
 		}
@@ -199,23 +199,23 @@  discard block
 block discarded – undo
 		return $id;
 	}
 
-	public static function updateDomains($domains, $monitorGroupId){
+	public static function updateDomains($domains, $monitorGroupId) {
 		$domains = trim($domains);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if ($monitorGroupId===0) return false;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 1 and monitorGroupId = $monitorGroupId");
 		$mysql->runQuery("update users set lastUpdate = '".$mysql->escape(date('Y-m-d H:i:s'))."'");
 		$mysql->runQuery("update monitorGroup set domains = '".$mysql->escape($domains)."' where id = $monitorGroupId");
 		$domainArray = preg_split('/\s+/', $domains);
-		foreach($domainArray as $d){
+		foreach ($domainArray as $d) {
 			$d = trim($d);
 			$d = str_ireplace('http://', '', $d);
 			$d = str_ireplace('https://', '', $d);
 			$d = str_ireplace('/', '', $d);
 			$d = preg_replace('/[[:^print:]]/', '', $d);
-			if($d != ''){
+			if ($d!='') {
 				$mysql->runQuery("
 					update monitors set
 						keepOnUpdate = 1
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
 						and ipDomain = '".$mysql->escape($d)."'
 						and isDomain = 1
 				");
-				if($mysql->affectedRows == 0){
+				if ($mysql->affectedRows==0) {
 					$mysql->runQuery("insert ignore into monitors set
 					monitorGroupId = $monitorGroupId,
 					ipDomain = '".$mysql->escape($d)."',
@@ -238,19 +238,19 @@  discard block
 block discarded – undo
 		$mysql->close();
 	}
 
-	public static function updateIPs($ips, $monitorGroupId){
+	public static function updateIPs($ips, $monitorGroupId) {
 		$ips = trim($ips);
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId===0) return false;
+		if ($monitorGroupId===0) return false;
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 0 and monitorGroupId = $monitorGroupId");
 		$mysql->runQuery("update users set lastUpdate = '".$mysql->escape(date('Y-m-d H:i:s'))."'");
 		$mysql->runQuery("update monitorGroup set ips = '".$mysql->escape($ips)."' where id = $monitorGroupId");
-		$ipsArray  = preg_split('/\s+/', $ips);
-		foreach($ipsArray as $i){
+		$ipsArray = preg_split('/\s+/', $ips);
+		foreach ($ipsArray as $i) {
 			// ip checks
-			if(_IpAddresses::isIPAddress($i)){
+			if (_IpAddresses::isIPAddress($i)) {
 				$mysql->runQuery("
 					update monitors set
 					keepOnUpdate = 1
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
 						and ipDomain = '".$mysql->escape($i)."'
 						and isDomain = 0
 					");
-				if($mysql->affectedRows == 0){
+				if ($mysql->affectedRows==0) {
 					$mysql->runQuery("insert ignore into monitors set
 						monitorGroupId = $monitorGroupId,
 						ipDomain = '".$mysql->escape($i)."', 
@@ -267,19 +267,19 @@  discard block
 block discarded – undo
 						keepOnUpdate = 1
 						");
 				}
-			}else{
+			}else {
 				//cidr /24's max...
-				if(trim($i)!=''){
-					if(strpos($i, ' ')!==false) continue;
-					if(strpos($i, ':')!==false) continue;
+				if (trim($i)!='') {
+					if (strpos($i, ' ')!==false) continue;
+					if (strpos($i, ':')!==false) continue;
 					$range = _IpAddresses::cidrToRange($i);
-					if($range===false) continue;
+					if ($range===false) continue;
 					$start = explode('.', $range[0]);
 					$end = explode('.', $range[1]);
-					if($range[0]==0) continue;// starts with 0
-					for($i = $start[3]; $i <= $end[3]; $i++){
+					if ($range[0]==0) continue; // starts with 0
+					for ($i = $start[3]; $i <= $end[3]; $i++) {
 						$host = "{$start[0]}.{$start[1]}.{$start[2]}.$i";
-						if(_IpAddresses::isIPAddress($host)){
+						if (_IpAddresses::isIPAddress($host)) {
 							$mysql->runQuery("
 								update monitors set
 									keepOnUpdate = 1
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
 										and ipDomain = '".$mysql->escape($host)."'
 										and isDomain = 0
 								");
-							if($mysql->affectedRows == 0){
+							if ($mysql->affectedRows==0) {
 								$mysql->runQuery("insert ignore into monitors set
 									monitorGroupId = $monitorGroupId,
 									ipDomain = '".$mysql->escape($host)."',
@@ -305,15 +305,15 @@  discard block
 block discarded – undo
 		$mysql->close();
 	}
 
-	public static function isLoggedIn(){
-		if(isset($_SESSION['id']) && (int)$_SESSION['id'] > 0){
+	public static function isLoggedIn() {
+		if (isset($_SESSION['id']) && (int)$_SESSION['id'] > 0) {
 			return $_SESSION['id'];
-		}else{
+		}else {
 			return false;
 		}
 	}
 
-	public static function getAccount(){
+	public static function getAccount() {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$ret = false;
@@ -330,12 +330,12 @@  discard block
 block discarded – undo
 				apiCallbackURL,
 				checkFrequency
 			from users limit 1");
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$ret = $row;
 		}
 		$mysql->close();
 
-		if(!$ret){
+		if (!$ret) {
 			//account
 			_Logging::appLog("no user account");
 			exit();
@@ -344,44 +344,44 @@  discard block
 block discarded – undo
 		return $ret;
 	}
 
-	public static function validateLogin($userName, $passwd, $api = false, $apiKey = ''){
+	public static function validateLogin($userName, $passwd, $api = false, $apiKey = '') {
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$sql = "
 		select username
 		from users
 		where ";
-		if(trim($apiKey) != ''){
+		if (trim($apiKey)!='') {
 			$sql .= " apiKey = '".$mysql->escape($apiKey)."'";
-		}else{
+		}else {
 			$sql .= " passwd = '".$mysql->escape(md5($passwd))."' 
 			and username = '".$mysql->escape($userName)."'";
 		}
 		$rs = $mysql->runQuery($sql);
 		$id = 0;
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$id = 1;
 		}
 		$mysql->close();
 		return $id;
 	}
 
-	public static function lookupHostDNS($host){
-		if(_IpAddresses::isIPAddress($host)){
+	public static function lookupHostDNS($host) {
+		if (_IpAddresses::isIPAddress($host)) {
 			return _IpAddresses::getHostByIp($host);
-		}else{
+		}else {
 			$host = escapeshellarg($host);
 			exec('host -t a -W 2 '.$host, $output, $return);
-			if ($return !== 0) {
+			if ($return!==0) {
 				return '';
-			}else{
+			}else {
 				$output = implode($output);
 				$ips = _IpAddresses::getAllIPsFromString($output, true);
 				$ir = "";
-				foreach($ips as $ip){
+				foreach ($ips as $ip) {
 					$ir .= "$ip,";
 				}
-				return trim($ir,',');
+				return trim($ir, ',');
 			}
 
 			/*
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
 		}
 	}
 
-	public static function testAPICallback($url){
+	public static function testAPICallback($url) {
 		return self::makeAPICallback($url,
 			'samplehosttest.com', 
 			true, 
@@ -403,8 +403,8 @@  discard block
 block discarded – undo
 			);
 	}
 
-	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
-		if(substr($url,0,4)!='http') return false;
+	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status) {
+		if (substr($url, 0, 4)!='http') return false;
 
 		$vars = json_encode(
 			array(
@@ -415,14 +415,14 @@  discard block
 block discarded – undo
 			)
 		);
 		$err = true;
-		try{
+		try {
 			$ch = curl_init();
-			curl_setopt($ch,CURLOPT_URL,$url);
-			curl_setopt($ch,CURLOPT_POST,true);
-			curl_setopt($ch,CURLOPT_FAILONERROR,true);
-			curl_setopt($ch,CURLOPT_RETURNTRANSFER,true);
-			curl_setopt($ch,CURLOPT_POSTFIELDS,$vars);
-			curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_FAILONERROR, true);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $vars);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json')); 
 			curl_exec($ch);
 			if (curl_errno($ch)) $err = false;
 		} catch (Exception $e) {
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
 		return $err;
 	}
 
-	public static function isValidEmail($emailAddress){
+	public static function isValidEmail($emailAddress) {
 		if (filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
 			return true;
 		}
@@ -442,36 +442,36 @@  discard block
 block discarded – undo
 		$text,
 		$beginText,
 		$endText,
-		$removeSpace=true,
-		$removeHtmlTags=true,
-		$firstResultOnlyNoArray=false) {
+		$removeSpace = true,
+		$removeHtmlTags = true,
+		$firstResultOnlyNoArray = false) {
 		$results = array();
 		$endPos = 0;
-		while(true) {
+		while (true) {
 				$beginPos = stripos($text, $beginText, $endPos);
-				if($beginPos===false) break;
+				if ($beginPos===false) break;
 				$beginPos = $beginPos+strlen($beginText);
 				$endPos = stripos($text, $endText, $beginPos);
-				if($endPos===false) break;
+				if ($endPos===false) break;
 				$result = substr($text, $beginPos, $endPos-$beginPos);
-				if($removeSpace){
-						$result = str_replace("\t","",$result);
-						$result = str_replace("\n","",$result);
-						$result = preg_replace("/  /"," ",$result);
-						$result = preg_replace("~[\s]{2}?[\t]?~i"," ",$result);
-						$result = str_replace("  "," ",$result);
+				if ($removeSpace) {
+						$result = str_replace("\t", "", $result);
+						$result = str_replace("\n", "", $result);
+						$result = preg_replace("/  /", " ", $result);
+						$result = preg_replace("~[\s]{2}?[\t]?~i", " ", $result);
+						$result = str_replace("  ", " ", $result);
 						$result = trim($result);
 				}
-				if($removeHtmlTags){
+				if ($removeHtmlTags) {
 						$result = strip_tags($result);
 				}
-				if($firstResultOnlyNoArray) return $result;
-				if($result != '') $results[] = $result;
+				if ($firstResultOnlyNoArray) return $result;
+				if ($result!='') $results[] = $result;
 		}
 		return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
 	 }
 
-	public static function getNextMonitor($mysql){
+	public static function getNextMonitor($mysql) {
 		$ipDomain = $mysql->runQueryReturnVar("select ipDomain from monitors where beenChecked = 0");
 		$mysql->runQuery("update monitors set beenChecked = 1 where ipDomain = '".$mysql->escape($ipDomain)."'");
 		return $ipDomain;
@@ -480,49 +480,49 @@  discard block
 block discarded – undo
 	public static function getHostChangeCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where lastStatusChanged = 1 $sql");
 	}
 
 	public static function getHostErrorCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($onlyNew) $sql .= " and lastStatusChanged = 1 ";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 1 $sql");
 	}
 
 	public static function getHostCleanCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
-		if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
+		if ($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
+		if ($onlyNew) $sql .= " and lastStatusChanged = 1 ";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 0 $sql");
 	}
 
 	public static function getHostCount($mysql, $monitorGroupId = 0) {
 		$sql = '';
 		$monitorGroupId = (int)$monitorGroupId;
-		if($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
+		if ($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
 		return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors $sql");
 	}
 
 	//CREDIT: http://braincrafted.com/php-background-processes/
-	public static function is_process_running($pid){
+	public static function is_process_running($pid) {
 		$pid = (int)$pid;
-		if($pid == 0) return false;
-		if(file_exists('/proc/'.$pid)){
+		if ($pid==0) return false;
+		if (file_exists('/proc/'.$pid)) {
 			return true;
-		}else{
+		}else {
 			return false;
 		}
 	}
 
 	public static function run_in_background($command, $priority = 0) {
 		$log = Setup::$settings['log_path'];
-		if($priority !=0){
+		if ($priority!=0) {
 			$pid = shell_exec("nohup nice -n $priority $command >> $log 2>&1 & echo $!");
-		}else{
+		}else {
 			$pid = shell_exec("nohup $command >> $log 2>&1 & echo $!");
 		}
 		return($pid);

Please login to merge, or discard this patch.

account.php 2 patches

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
 class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
 class_exists('PHPMailer', false) or include('classes/class.phpmailer.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php');
 	exit();
 }
@@ -13,17 +13,17 @@  discard block
 block discarded – undo
 $titlePreFix = "account";
 $message = array();
 
-$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']),0,100) : '';
-$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'],0,8000) : '';
-$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'],0,8000) : '';
-$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'],0,32) : '';
-$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'],0,32) : '';
-$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'],0,32) : '';
+$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']), 0, 100) : '';
+$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'], 0, 8000) : '';
+$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'], 0, 8000) : '';
+$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'], 0, 32) : '';
+$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'], 0, 32) : '';
+$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'], 0, 32) : '';
 $disableEmailNotices = array_key_exists('disableEmailNotices', $_POST) ? (int)$_POST['disableEmailNotices'] : 0;
 $beenChecked = array_key_exists('beenChecked', $_POST) ? (int)$_POST['beenChecked'] : 0;
-$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']),0,15) : '';
-$twitterHandle = str_replace('@','',$twitterHandle);
-$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']),0,2000) : '';
+$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']), 0, 15) : '';
+$twitterHandle = str_replace('@', '', $twitterHandle);
+$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']), 0, 2000) : '';
 $testUrl = array_key_exists('testUrl', $_GET) ? $_GET['testUrl'] : '';
 
 $mysql = new _MySQL();
@@ -32,40 +32,40 @@  discard block
 block discarded – undo
 // audit check frequency
 $checkFrequency = array_key_exists('checkFrequency', $_POST) ? $_POST['checkFrequency'] : '';
 
-if($testUrl!=''){
-	if(Utilities::testAPICallback($testUrl)){
+if ($testUrl!='') {
+	if (Utilities::testAPICallback($testUrl)) {
 		echo('true');
-	}else{
+	}else {
 		echo('false');
 	}
 	exit();
 }
 
 if (isset($_POST["submit"])) {
-	if($passwd=='') $message[] = 'You must select a password.';
+	if ($passwd=='') $message[] = 'You must select a password.';
 
-	if($passwdOld != $passwd){
+	if ($passwdOld!=$passwd) {
 		$passwdOld = md5($passwd);
 	}
 
-	$ta = explode("\n",$noticeEmailAddresses);
+	$ta = explode("\n", $noticeEmailAddresses);
 	$noticeEmailAddresses = "";
-	foreach($ta as $e){
+	foreach ($ta as $e) {
 		$e = trim($e);
-		if(Utilities::isValidEmail($e)){
+		if (Utilities::isValidEmail($e)) {
 			$noticeEmailAddresses .= "$e\n";
 		}
 	}
-	$ta = explode("\n",$textMessageEmails);
+	$ta = explode("\n", $textMessageEmails);
 	$textMessageEmails = "";
-	foreach($ta as $e){
+	foreach ($ta as $e) {
 		$e = trim($e);
-		if(Utilities::isValidEmail($e)){
+		if (Utilities::isValidEmail($e)) {
 			$textMessageEmails .= "$e\n";
 		}
 	}
 	//TODO: make sure blacklists are domains with an ip address on them
-	if(count($message) == 0){
+	if (count($message)==0) {
 		//update
 		$mysql->runQuery("
 			update users set username = '".$mysql->escape($username)."',
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
 			checkFrequency = '".$mysql->escape($checkFrequency)."',
 			disableEmailNotices = $disableEmailNotices
 			");
-		if($beenChecked==1){
+		if ($beenChecked==1) {
 			$mysql->runQuery("update users set beenChecked = 0");
 				$message[] = "Check scheduled.";
 		}
-		if($twitterHandle!=''){
+		if ($twitterHandle!='') {
 			$t = new Twitter();
 			$t->follow($twitterHandle);
 		}
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 	}
 }
 $user = Utilities::getAccount();
-if(!$user){
+if (!$user) {
 	//invalid account
 	echo("<script>window.location='login.php?logout=1';</script>");
 	exit();
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
 <div class="row">
 	<div class="col-md-3">
 	<ul class="nav nav-pills nav-stacked">
-		<li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql)));?></span></li>
-		<li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql)));?></span></li>
+		<li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql))); ?></span></li>
+		<li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql))); ?></span></li>
 	</ul>
 	</div>
 </div>
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 </script>
 
 <?php
-foreach($message as $m){
+foreach ($message as $m) {
 	echo("<div class=\"alert alert-info alert-dismissable\"><button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-hidden=\"true\">&times;</button>$m</div>");
 }
 ?>
@@ -145,30 +145,30 @@  discard block
 block discarded – undo
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="username">Login Username</label>
 		<div class="col-sm-6">
-			<input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']);?>" placeholder="username">
+			<input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']); ?>" placeholder="username">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="passwd">Password</label>
 		<div class="col-sm-6">
-			<input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']);?>" class="form-control" placeholder="Password">
+			<input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']); ?>" class="form-control" placeholder="Password">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="apiKey">API Key</label>
 		<div class="col-sm-6">
-			<input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']);?>" placeholder="api key">
+			<input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']); ?>" placeholder="api key">
 		</div>
 	</div>
 	<div class="form-group">
 		<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
 		<div class="col-sm-6">
 			<select id="checkFrequency" name="checkFrequency" class="form-control">
-				<option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
-				<option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
-				<option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
-				<option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
-				<option value="1hour"<?php if($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
+				<option value="weekly"<?php if ($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
+				<option value="daily"<?php if ($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
+				<option value="8hour"<?php if ($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
+				<option value="2hour"<?php if ($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
+				<option value="1hour"<?php if ($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
 			</select>
 		</div>
 	</div>
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 		<div class="col-sm-6">
 			<div class="input-group">
 				<span class="input-group-addon">@</span>
-				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
+				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']); ?>" placeholder="twitter username">
 			</div>
 		</div>
 	</div>
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 		</label>
 		<div class="col-sm-6">
 			<div class="input-group">
-				<input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']);?>" placeholder="api callback url">
+				<input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']); ?>" placeholder="api callback url">
 				<span class="input-group-btn">
 					<button class="btn btn-default" type="button" onclick="testAPIUrl()">Test Callback</button>
 				</span>
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
 		</div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
+		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if ($user['disableEmailNotices']==1) echo(' checked'); ?>></label>
 		<div class="col-sm-6">
 			Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes.  Useful if you have a frequently changing network.  This does not pause api call backs.</small>
 		</div>
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
 			<button type="submit" name="submit" value="submit" class="btn btn-primary">Save changes</button>
 		</div>
 	</div>
-	<input type="hidden" value="<?php echo($user['passwd']);?>" name="passwdOld"/>
+	<input type="hidden" value="<?php echo($user['passwd']); ?>" name="passwdOld"/>
 </form>
 
 <br/><br/><br/><br/>

Please login to merge, or discard this patch.

Braces +13 added lines, -5 removed lines patch added patch discarded remove patch

@@ -35,14 +35,16 @@  discard block
 block discarded – undo
 if($testUrl!=''){
 	if(Utilities::testAPICallback($testUrl)){
 		echo('true');
-	}else{
+	} else{
 		echo('false');
 	}
 	exit();
 }
 
 if (isset($_POST["submit"])) {
-	if($passwd=='') $message[] = 'You must select a password.';
+	if($passwd=='') {
+		$message[] = 'You must select a password.';
+	}
 
 	if($passwdOld != $passwd){
 		$passwdOld = md5($passwd);
@@ -164,7 +166,8 @@  discard block
 block discarded – undo
 		<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
 		<div class="col-sm-6">
 			<select id="checkFrequency" name="checkFrequency" class="form-control">
-				<option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
+				<option value="weekly"<?php if($user['checkFrequency']=='weekly') {
+	echo ' selected'?>>Weekly</option>
 				<option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
 				<option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
 				<option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
@@ -190,7 +193,9 @@  discard block
 block discarded – undo
 		<div class="col-sm-6">
 			<div class="input-group">
 				<span class="input-group-addon">@</span>
-				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
+				<input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);
+}
+?>" placeholder="twitter username">
 			</div>
 		</div>
 	</div>
@@ -209,7 +214,10 @@  discard block
 block discarded – undo
 		</div>
 	</div>
 	<div class="form-group">
-		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
+		<label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) {
+	echo(' checked');
+}
+?>></label>
 		<div class="col-sm-6">
 			Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes.  Useful if you have a frequently changing network.  This does not pause api call backs.</small>
 		</div>

Please login to merge, or discard this patch.

accountSubnav.inc.php 2 patches

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@
 block discarded – undo
 <div id="accountSubnav">
 	<ul class="nav nav-tabs">
-		<li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
-		<li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
-		<li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
-		<li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
+		<li <?php if ($pageName=='account.php') echo('class="active"'); ?>><a href="account.php">Profile</a></li>
+		<li <?php if ($pageName=='monitorGroup.php') echo('class="active"'); ?>><a href="monitorGroup.php">Monitor Groups</a></li>
+		<li <?php if ($pageName=='blockLists.php') echo('class="active"'); ?>><a href="blockLists.php">Block Lists</a></li>
+		<li <?php if ($pageName=='apiDocumentation.php') echo('class="active"'); ?>><a href="apiDocumentation.php">API Documentation</a></li>
 	</ul>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +16 added lines, -4 removed lines patch added patch discarded remove patch

@@ -1,8 +1,20 @@
 block discarded – undo
 <div id="accountSubnav">
 	<ul class="nav nav-tabs">
-		<li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
-		<li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
-		<li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
-		<li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
+		<li <?php if($pageName=='account.php') {
+	echo('class="active"');
+}
+?>><a href="account.php">Profile</a></li>
+		<li <?php if($pageName=='monitorGroup.php') {
+	echo('class="active"');
+}
+?>><a href="monitorGroup.php">Monitor Groups</a></li>
+		<li <?php if($pageName=='blockLists.php') {
+	echo('class="active"');
+}
+?>><a href="blockLists.php">Block Lists</a></li>
+		<li <?php if($pageName=='apiDocumentation.php') {
+	echo('class="active"');
+}
+?>><a href="apiDocumentation.php">API Documentation</a></li>
 	</ul>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

api.php 3 patches

Switch Indentation +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -24,51 +24,51 @@  discard block
 block discarded – undo
 }
 
 switch($type){
-	case 'updateDomains':
-		if($groupName=='') {
-			$result['status'] = 'groupName is required';
+		case 'updateDomains':
+			if($groupName=='') {
+				$result['status'] = 'groupName is required';
+				break;
+			}
+			$id = Utilities::ensureGroupExists($groupName);
+			Utilities::updateDomains($data, $id);
+			$result['status'] = 'success';
 			break;
-		}
-		$id = Utilities::ensureGroupExists($groupName);
-		Utilities::updateDomains($data, $id);
-		$result['status'] = 'success';
-		break;
 
-	case 'updateIPs':
-		if($groupName=='') {
-			$result['status'] = 'groupName is required';
+		case 'updateIPs':
+			if($groupName=='') {
+				$result['status'] = 'groupName is required';
+				break;
+			}
+			$id = Utilities::ensureGroupExists($groupName);
+			Utilities::updateIPs($data, $id);
+			$result['status'] = 'success';
 			break;
-		}
-		$id = Utilities::ensureGroupExists($groupName);
-		Utilities::updateIPs($data, $id);
-		$result['status'] = 'success';
-		break;
 
-	case 'checkHostStatus':
-		$result['status'] = 'success';
-		Utilities::setBlockLists();
-		$result['result'] = Utilities::checkBlacklists($data);
-		break;
+		case 'checkHostStatus':
+			$result['status'] = 'success';
+			Utilities::setBlockLists();
+			$result['result'] = Utilities::checkBlacklists($data);
+			break;
 
-	case 'clearAllHostAndGroupData':
-		$mysql = new _MySQL();
-		$mysql->connect(Setup::$connectionArray);
-		$mysql->runQuery("truncate table monitors");
-		$mysql->runQuery("truncate table monitorGroup");
-		$result['status'] = 'success';
-		break;
+		case 'clearAllHostAndGroupData':
+			$mysql = new _MySQL();
+			$mysql->connect(Setup::$connectionArray);
+			$mysql->runQuery("truncate table monitors");
+			$mysql->runQuery("truncate table monitorGroup");
+			$result['status'] = 'success';
+			break;
 
-	case 'blacklistStatus':
-		$localCache = new _FileCache('blacklistmonitor-api', 90);
-		$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
-		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
-			output($cacheData);
-		}
-		$mysql = new _MySQL();
-		$mysql->connect(Setup::$connectionArray);
-		$searchSQL = '';
-		switch($data){
+		case 'blacklistStatus':
+			$localCache = new _FileCache('blacklistmonitor-api', 90);
+			$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
+			$cacheData = $localCache->get($cacheKey);
+			if ($cacheData !== false) {
+				output($cacheData);
+			}
+			$mysql = new _MySQL();
+			$mysql->connect(Setup::$connectionArray);
+			$searchSQL = '';
+			switch($data){
 			case 'changed':
 				$searchSQL .= " and lastStatusChanged = 1 ";
 				break;
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
 				break;
 			case 'all':
 			default:
-		}
+			}
 
 		$rs = $mysql->runQuery("
 			select ipDomain,isBlocked,rDNS,status,lastStatusChangeTime,lastUpdate
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
 		$localCache->set($cacheKey, $result);
 		break;
 
-	default:
-		$result['status'] = 'no such method';
+		default:
+			$result['status'] = 'no such method';
 }
 
 output();

Please login to merge, or discard this patch.

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@
 block discarded – undo
 				domains = '".$mysql->escape($domains)."'
 			where id = $id
 			");
-	}else{
+	} else{
 		$mysql->runQuery("
 			insert into monitorGroup set groupName = '".$mysql->escape($groupName)."',
 				ips = '".$mysql->escape($ips)."',

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -18,14 +18,14 @@  discard block
 block discarded – undo
 );
 
 $id = Utilities::validateLogin($username, $passwd, true, $apiKey);
-if($id == 0) {
+if ($id==0) {
 	$result['status'] = 'invalid login';
 	output();
 }
 
-switch($type){
+switch ($type) {
 	case 'updateDomains':
-		if($groupName=='') {
+		if ($groupName=='') {
 			$result['status'] = 'groupName is required';
 			break;
 		}
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 		break;
 
 	case 'updateIPs':
-		if($groupName=='') {
+		if ($groupName=='') {
 			$result['status'] = 'groupName is required';
 			break;
 		}
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
 		$localCache = new _FileCache('blacklistmonitor-api', 90);
 		$cacheKey = md5("$username|$passwd|$apiKey|$type|$data");
 		$cacheData = $localCache->get($cacheKey);
-		if ($cacheData !== false) {
+		if ($cacheData!==false) {
 			output($cacheData);
 		}
 		$mysql = new _MySQL();
 		$mysql->connect(Setup::$connectionArray);
 		$searchSQL = '';
-		switch($data){
+		switch ($data) {
 			case 'changed':
 				$searchSQL .= " and lastStatusChanged = 1 ";
 				break;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 			where 1=1 $searchSQL");
 		$result['status'] = 'success';
 		$result['result'] = array();
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			$result['result'][] = array(
 				'host'=>$row['ipDomain'],
 				'isBlocked'=>$row['isBlocked'],
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
 
 output();
 
-function output($data = false){
+function output($data = false) {
 	global $result;
-	if($data!==false){
+	if ($data!==false) {
 		echo(json_encode($data));
-	}else{
+	}else {
 		echo(json_encode($result));
 	}
 	exit();

Please login to merge, or discard this patch.

apiDocumentation.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 class_exists('Setup', false) or include('classes/Setup.class.php');
 class_exists('Utilities', false) or include('classes/Utilities.class.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php');
 	exit();
 }
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 	</tr>
 	<tr>
 		<td>apiKey</td>
-		<td>Your api key: <?php echo $user['apiKey'];?></td>
+		<td>Your api key: <?php echo $user['apiKey']; ?></td>
 	</tr>
 	<tr>
 		<td>type</td>
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 <br/>
 <pre>
 &lt;?php
-$apiKey = '<?php echo $user['apiKey'];?>';
+$apiKey = '<?php echo $user['apiKey']; ?>';
 
 $requestBody =
 	&quot;apiKey=&quot;.urlencode($apiKey).

Please login to merge, or discard this patch.

blockLists.php 2 patches

Braces +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 			update blockLists
 			set isActive = '0'
 			where md5(host) = '".$mysql->escape($host)."'");
-	}else{
+	} else{
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '1'
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 			echo('<td style="text-align: center;">');
 			if($row['isActive']==0){
 				echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
-			}else{
+			} else{
 				echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
 			}
 			echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 class_exists('Utilities', false) or include('classes/Utilities.class.php');
 class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
 
-if(Utilities::isLoggedIn()===false){
+if (Utilities::isLoggedIn()===false) {
 	header('Location: login.php?location='.urlencode('hosts.php'));
 	exit();
 }
@@ -15,13 +15,13 @@  discard block
 block discarded – undo
 $user = Utilities::getAccount();
 $mysql = new _MySQL();
 $mysql->connect(Setup::$connectionArray);
-if($host != ''){
-	if($toggle==0){
+if ($host!='') {
+	if ($toggle==0) {
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '0'
 			where md5(host) = '".$mysql->escape($host)."'");
-	}else{
+	}else {
 		$mysql->runQuery("
 			update blockLists
 			set isActive = '1'
@@ -98,28 +98,28 @@  discard block
 block discarded – undo
 		</thead>
 		<tbody>
 		<?php
-		while($row = mysqli_fetch_array($rs)){
+		while ($row = mysqli_fetch_array($rs)) {
 			echo('<tr>');
 			echo('<td style="text-align: center;">');
-			if($row['isActive']==0){
+			if ($row['isActive']==0) {
 				echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
-			}else{
+			}else {
 				echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
 			}
 			echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');
 			echo('<td style="white-space: nowrap">'.($row['monitorType']=='ip' ? 'IP' : 'Domain').'</td>');
 			echo('<td>'.$row['description'].'</td>');
 			echo('<td style="text-align: center;">');
-			switch($row['importance']){
+			switch ($row['importance']) {
 				case 3: echo('<span class="label label-primary">High</span>'); break;
 				case 2: echo('<span class="label label-info">Medium</span>'); break;
 				case 1: echo('<span class="label label-default">Low</span>'); break;
 			}
 			echo('</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'],0).'</td>');
-			echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'],0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'], 0).'</td>');
+			echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'], 0).'</td>');
 			echo('</tr>');
 		}
 		$mysql->close();

Please login to merge, or discard this patch.

classes/Setup.class.php 2 patches

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -9,22 +9,22 @@  discard block
 block discarded – undo
 
 	public function __construct() {
 
-		if(self::$instance===null){
+		if (self::$instance===null) {
 
-			if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
+			if (!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
 			ini_set('error_reporting', E_ALL | E_STRICT | E_NOTICE);
 			$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
 			ini_set('display_errors', $cfg['display_errors']);
 			ini_set('error_log', $cfg['log_path']);
 
 			self::$settings = $cfg;
-			self::$settings['dns_servers'] = explode(',',$cfg['dns_servers']);
+			self::$settings['dns_servers'] = explode(',', $cfg['dns_servers']);
 
 			// clean up
-			if(Setup::$settings['rbl_txt_extended_status']=='true' ||
-			  Setup::$settings['rbl_txt_extended_status']=='1'){
+			if (Setup::$settings['rbl_txt_extended_status']=='true' ||
+			  Setup::$settings['rbl_txt_extended_status']=='1') {
 				Setup::$settings['rbl_txt_extended_status'] = true;
-			}else{
+			}else {
 				Setup::$settings['rbl_txt_extended_status'] = false;
 			}
 
@@ -44,6 +44,6 @@  discard block
 block discarded – undo
 }
 
 Setup::$instance = new Setup();
-if(php_sapi_name()!=='cli'){
+if (php_sapi_name()!=='cli') {
 	session_start();
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

@@ -11,7 +11,9 @@  discard block
 block discarded – undo
 
 		if(self::$instance===null){
 
-			if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
+			if(!file_exists('/etc/blacklistmonitor.cfg')) {
+				echo('no config file in /etc/blacklistmonitor.cfg');
+			}
 			ini_set('error_reporting', E_ALL | E_STRICT | E_NOTICE);
 			$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
 			ini_set('display_errors', $cfg['display_errors']);
@@ -24,7 +26,7 @@  discard block
 block discarded – undo
 			if(Setup::$settings['rbl_txt_extended_status']=='true' ||
 			  Setup::$settings['rbl_txt_extended_status']=='1'){
 				Setup::$settings['rbl_txt_extended_status'] = true;
-			}else{
+			} else{
 				Setup::$settings['rbl_txt_extended_status'] = false;
 			}
 

Please login to merge, or discard this patch.

		@@ -929,7 +929,7 @@
		block discarded – undo
929	929	* Send raw data to the server.
930	930	* @param string $data The data to send
931	931	* @access public
932		- * @return integer\|boolean The number of bytes sent to the server or false on error
	932	+ * @return integer The number of bytes sent to the server or false on error
933	933	*/
934	934	public function client_send($data)
935	935	{

GitHub Access Token became invalid

Push — master ( 15bbb1...ec3fdd )

Status

Category

Doc Comments +8 added lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +17 added lines, -5 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

Doc Comments +22 added lines patch added patch discarded remove patch

Braces +93 added lines, -40 removed lines patch added patch discarded remove patch

Spacing +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Braces +13 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +16 added lines, -4 removed lines patch added patch discarded remove patch

Switch Indentation +42 added lines, -42 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch

		@@ -39,6 +39,10 @@ discard block
		block discarded – undo
39	39	// $key: The cache key.
40	40	// Returns:
41	41	// The object which was previously stored, or false if a cache miss occurred.
	42	+
	43	+ /**
	44	+ * @param string $key
	45	+ */
42	46	public function get($key) {
43	47	//return false;
44	48	if (($this->cleanInterval == 1) \|\|
		@@ -59,6 +63,10 @@ discard block
		block discarded – undo
59	63	// Parameters:
60	64	// $key: The cache key.
61	65	// $value: The object to store.
	66	+
	67	+ /**
	68	+ * @param string $key
	69	+ */
62	70	public function set($key, $value) {
63	71	if (($this->cleanInterval == 1) \|\|
64	72	(rand(1, $this->cleanInterval) == $this->cleanInterval)) {

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	if ($cleanInterval < 1) $cleanInterval = 1;
31	31	$this->cleanInterval = (int)$cleanInterval;
32	32
33		- if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
	33	+ if ($directoryDepth < 1) $directoryDepth = 1; else if ($directoryDepth > 10) $directoryDepth = 10;
34	34	$this->directoryDepth = (int)$directoryDepth;
35	35	}
36	36
		@@ -41,8 +41,8 @@ discard block
		block discarded – undo
41	41	// The object which was previously stored, or false if a cache miss occurred.
42	42	public function get($key) {
43	43	//return false;
44		- if (($this->cleanInterval == 1) \|\|
45		- (rand(1, $this->cleanInterval) == $this->cleanInterval)) {
	44	+ if (($this->cleanInterval==1) \|\|
	45	+ (rand(1, $this->cleanInterval)==$this->cleanInterval)) {
46	46	$this->clean();
47	47	}
48	48	$val = false;
		@@ -60,12 +60,12 @@ discard block
		block discarded – undo
60	60	// $key: The cache key.
61	61	// $value: The object to store.
62	62	public function set($key, $value) {
63		- if (($this->cleanInterval == 1) \|\|
64		- (rand(1, $this->cleanInterval) == $this->cleanInterval)) {
	63	+ if (($this->cleanInterval==1) \|\|
	64	+ (rand(1, $this->cleanInterval)==$this->cleanInterval)) {
65	65	$this->clean();
66	66	}
67	67	$fn = $this->getCacheFilename($key, true);
68		- $fileData = file_put_contents($fn,serialize($value));
	68	+ $fileData = file_put_contents($fn, serialize($value));
69	69	}
70	70
71	71	// Delete an object from the cache.
		@@ -97,11 +97,11 @@ discard block
		block discarded – undo
97	97	foreach (@glob($path.'/*', GLOB_NOSORT) as $fn) {
98	98	if (@is_dir($fn)) {
99	99	$this->cleanPath($fn);
100		- } else if (@filemtime($fn) <= $exptime) {
	100	+ }else if (@filemtime($fn) <= $exptime) {
101	101	@unlink($fn);
102	102	}
103	103	}
104		- if ($path != $this->path) {
	104	+ if ($path!=$this->path) {
105	105	@rmdir($path);
106	106	}
107	107	}
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	}
119	119
120	120	public function fixPermissions($user) {
121		- $cmd = escapeshellcmd('chown -R '.$user.':'.$user. ' ' . $this->path);
	121	+ $cmd = escapeshellcmd('chown -R '.$user.':'.$user.' '.$this->path);
122	122	exec($cmd);
123	123	}
124	124

		@@ -24,13 +24,21 @@ discard block
		block discarded – undo
24	24
25	25	$this->path = '/tmp/_FileCache_/'.(string)$path;
26	26
27		- if ($expirationTimeInSeconds < 1) $expirationTimeInSeconds = 1;
	27	+ if ($expirationTimeInSeconds < 1) {
	28	+ $expirationTimeInSeconds = 1;
	29	+ }
28	30	$this->expirationTimeInSeconds = (int)$expirationTimeInSeconds;
29	31
30		- if ($cleanInterval < 1) $cleanInterval = 1;
	32	+ if ($cleanInterval < 1) {
	33	+ $cleanInterval = 1;
	34	+ }
31	35	$this->cleanInterval = (int)$cleanInterval;
32	36
33		- if ($directoryDepth<1) $directoryDepth=1; else if ($directoryDepth>10) $directoryDepth=10;
	37	+ if ($directoryDepth<1) {
	38	+ $directoryDepth=1;
	39	+ } else if ($directoryDepth>10) {
	40	+ $directoryDepth=10;
	41	+ }
34	42	$this->directoryDepth = (int)$directoryDepth;
35	43	}
36	44
		@@ -80,7 +88,9 @@ discard block
		block discarded – undo
80	88	$refPath = rtrim($this->path, "/\\");
81	89	$dir = rtrim(dirname($fn), "/\\");
82	90	for ($i = 0; $i < $this->directoryDepth; $i++) {
83		- if (!@rmdir($dir)) break;
	91	+ if (!@rmdir($dir)) {
	92	+ break;
	93	+ }
84	94	$dir = rtrim(dirname($dir), "/\\");
85	95	}
86	96	}
		@@ -112,7 +122,9 @@ discard block
		block discarded – undo
112	122	for ($i = 0, $idx = 0; $i < $this->directoryDepth; $i++, $idx += 2) {
113	123	$path .= '/'.substr($hash, $idx, 2);
114	124	}
115		- if ($autoCreateDirectory) @mkdir($path, 0777, true);
	125	+ if ($autoCreateDirectory) {
	126	+ @mkdir($path, 0777, true);
	127	+ }
116	128	$path .= '/'.$hash;
117	129	return $path;
118	130	}

		@@ -227,7 +227,7 @@ discard block
		block discarded – undo
227	227	default:
228	228	//Normalize line breaks
229	229	$str = preg_replace('/(\r\n\|\r\|\n)/ms', "\n", $str);
230		- echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
	230	+ echo gmdate('Y-m-d H:i:s')."\t".str_replace(
231	231	"\n",
232	232	"\n \t ",
233	233	trim($str)
		@@ -274,14 +274,14 @@ discard block
		block discarded – undo
274	274	$socket_context = stream_context_create($options);
275	275	//Suppress errors; connection failures are handled at a higher level
276	276	$this->smtp_conn = @stream_socket_client(
277		- $host . ":" . $port,
	277	+ $host.":".$port,
278	278	$errno,
279	279	$errstr,
280	280	$timeout,
281	281	STREAM_CLIENT_CONNECT,
282	282	$socket_context
283	283	);
284		- } else {
	284	+ }else {
285	285	//Fall back to fsockopen which should work in more places, but is missing some features
286	286	$this->edebug(
287	287	"Connection: stream_socket_client not available, falling back to fsockopen",
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	$errstr
304	304	);
305	305	$this->edebug(
306		- 'SMTP ERROR: ' . $this->error['error']
	306	+ 'SMTP ERROR: '.$this->error['error']
307	307	. ": $errstr ($errno)",
308	308	self::DEBUG_CLIENT
309	309	);
		@@ -312,17 +312,17 @@ discard block
		block discarded – undo
312	312	$this->edebug('Connection: opened', self::DEBUG_CONNECTION);
313	313	// SMTP server can take longer to respond, give longer timeout for first read
314	314	// Windows does not have support for this timeout function
315		- if (substr(PHP_OS, 0, 3) != 'WIN') {
	315	+ if (substr(PHP_OS, 0, 3)!='WIN') {
316	316	$max = ini_get('max_execution_time');
317	317	// Don't bother if unlimited
318		- if ($max != 0 && $timeout > $max) {
	318	+ if ($max!=0 && $timeout > $max) {
319	319	@set_time_limit($timeout);
320	320	}
321	321	stream_set_timeout($this->smtp_conn, $timeout, 0);
322	322	}
323	323	// Get any announcement
324	324	$announce = $this->get_lines();
325		- $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
	325	+ $this->edebug('SERVER -> CLIENT: '.$announce, self::DEBUG_SERVER);
326	326	return true;
327	327	}
328	328
		@@ -381,9 +381,9 @@ discard block
		block discarded – undo
381	381	return false;
382	382	}
383	383
384		- self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
	384	+ self::edebug('Auth method requested: '.($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
385	385	self::edebug(
386		- 'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
	386	+ 'Auth methods available on the server: '.implode(',', $this->server_caps['AUTH']),
387	387	self::DEBUG_LOWLEVEL
388	388	);
389	389
		@@ -417,7 +417,7 @@ discard block
		block discarded – undo
417	417	// Send encoded username and password
418	418	if (!$this->sendCommand(
419	419	'User & Password',
420		- base64_encode("\0" . $username . "\0" . $password),
	420	+ base64_encode("\0".$username."\0".$password),
421	421	235
422	422	)
423	423	) {
		@@ -463,7 +463,7 @@ discard block
		block discarded – undo
463	463
464	464	if (!$this->sendCommand(
465	465	'AUTH NTLM',
466		- 'AUTH NTLM ' . base64_encode($msg1),
	466	+ 'AUTH NTLM '.base64_encode($msg1),
467	467	334
468	468	)
469	469	) {
		@@ -495,7 +495,7 @@ discard block
		block discarded – undo
495	495	$challenge = base64_decode(substr($this->last_reply, 4));
496	496
497	497	// Build the response
498		- $response = $username . ' ' . $this->hmac($challenge, $password);
	498	+ $response = $username.' '.$this->hmac($challenge, $password);
499	499
500	500	// send encoded credentials
501	501	return $this->sendCommand('Username', base64_encode($response), 235);
		@@ -539,7 +539,7 @@ discard block
		block discarded – undo
539	539	$k_ipad = $key ^ $ipad;
540	540	$k_opad = $key ^ $opad;
541	541
542		- return md5($k_opad . pack('H*', md5($k_ipad . $data)));
	542	+ return md5($k_opad.pack('H*', md5($k_ipad.$data)));
543	543	}
544	544
545	545	/**
		@@ -622,13 +622,13 @@ discard block
		block discarded – undo
622	622
623	623	$field = substr($lines[0], 0, strpos($lines[0], ':'));
624	624	$in_headers = false;
625		- if (!empty($field) && strpos($field, ' ') === false) {
	625	+ if (!empty($field) && strpos($field, ' ')===false) {
626	626	$in_headers = true;
627	627	}
628	628
629	629	foreach ($lines as $line) {
630	630	$lines_out = array();
631		- if ($in_headers and $line == '') {
	631	+ if ($in_headers and $line=='') {
632	632	$in_headers = false;
633	633	}
634	634	//Break this line up into several smaller lines if it's too long
		@@ -640,18 +640,18 @@ discard block
		block discarded – undo
640	640	//Deliberately matches both false and 0
641	641	if (!$pos) {
642	642	//No nice break found, add a hard break
643		- $pos = self::MAX_LINE_LENGTH - 1;
	643	+ $pos = self::MAX_LINE_LENGTH-1;
644	644	$lines_out[] = substr($line, 0, $pos);
645	645	$line = substr($line, $pos);
646		- } else {
	646	+ }else {
647	647	//Break at the found point
648	648	$lines_out[] = substr($line, 0, $pos);
649	649	//Move along by the amount we dealt with
650		- $line = substr($line, $pos + 1);
	650	+ $line = substr($line, $pos+1);
651	651	}
652	652	//If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
653	653	if ($in_headers) {
654		- $line = "\t" . $line;
	654	+ $line = "\t".$line;
655	655	}
656	656	}
657	657	$lines_out[] = $line;
		@@ -659,17 +659,17 @@ discard block
		block discarded – undo
659	659	//Send the lines to the server
660	660	foreach ($lines_out as $line_out) {
661	661	//RFC2821 section 4.5.2
662		- if (!empty($line_out) and $line_out[0] == '.') {
663		- $line_out = '.' . $line_out;
	662	+ if (!empty($line_out) and $line_out[0]=='.') {
	663	+ $line_out = '.'.$line_out;
664	664	}
665		- $this->client_send($line_out . self::CRLF);
	665	+ $this->client_send($line_out.self::CRLF);
666	666	}
667	667	}
668	668
669	669	//Message data has been sent, complete the command
670	670	//Increase timelimit for end of DATA command
671	671	$savetimelimit = $this->Timelimit;
672		- $this->Timelimit = $this->Timelimit * 2;
	672	+ $this->Timelimit = $this->Timelimit*2;
673	673	$result = $this->sendCommand('DATA END', '.', 250);
674	674	//Restore timelimit
675	675	$this->Timelimit = $savetimelimit;
		@@ -703,11 +703,11 @@ discard block
		block discarded – undo
703	703	*/
704	704	protected function sendHello($hello, $host)
705	705	{
706		- $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
	706	+ $noerror = $this->sendCommand($hello, $hello.' '.$host, 250);
707	707	$this->helo_rply = $this->last_reply;
708	708	if ($noerror) {
709	709	$this->parseHelloFields($hello);
710		- } else {
	710	+ }else {
711	711	$this->server_caps = null;
712	712	}
713	713	return $noerror;
		@@ -733,9 +733,9 @@ discard block
		block discarded – undo
733	733	if (!$n) {
734	734	$name = $type;
735	735	$fields = $fields[0];
736		- } else {
	736	+ }else {
737	737	$name = array_shift($fields);
738		- if ($name == 'SIZE') {
	738	+ if ($name=='SIZE') {
739	739	$fields = ($fields) ? $fields[0] : 0;
740	740	}
741	741	}
		@@ -760,7 +760,7 @@ discard block
		block discarded – undo
760	760	$useVerp = ($this->do_verp ? ' XVERP' : '');
761	761	return $this->sendCommand(
762	762	'MAIL FROM',
763		- 'MAIL FROM:<' . $from . '>' . $useVerp,
	763	+ 'MAIL FROM:<'.$from.'>'.$useVerp,
764	764	250
765	765	);
766	766	}
		@@ -797,7 +797,7 @@ discard block
		block discarded – undo
797	797	{
798	798	return $this->sendCommand(
799	799	'RCPT TO',
800		- 'RCPT TO:<' . $toaddr . '>',
	800	+ 'RCPT TO:<'.$toaddr.'>',
801	801	array(250, 251)
802	802	);
803	803	}
		@@ -828,7 +828,7 @@ discard block
		block discarded – undo
828	828	$this->setError("Called $command without being connected");
829	829	return false;
830	830	}
831		- $this->client_send($commandstring . self::CRLF);
	831	+ $this->client_send($commandstring.self::CRLF);
832	832
833	833	$this->last_reply = $this->get_lines();
834	834	// Fetch SMTP code and possible error code explanation
		@@ -842,14 +842,14 @@ discard block
		block discarded – undo
842	842	'',
843	843	$this->last_reply
844	844	);
845		- } else {
	845	+ }else {
846	846	// Fall back to simple parsing if regex fails
847	847	$code = substr($this->last_reply, 0, 3);
848	848	$code_ex = null;
849	849	$detail = substr($this->last_reply, 4);
850	850	}
851	851
852		- $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
	852	+ $this->edebug('SERVER -> CLIENT: '.$this->last_reply, self::DEBUG_SERVER);
853	853
854	854	if (!in_array($code, (array)$expect)) {
855	855	$this->setError(
		@@ -859,7 +859,7 @@ discard block
		block discarded – undo
859	859	$code_ex
860	860	);
861	861	$this->edebug(
862		- 'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
	862	+ 'SMTP ERROR: '.$this->error['error'].': '.$this->last_reply,
863	863	self::DEBUG_CLIENT
864	864	);
865	865	return false;
		@@ -921,7 +921,7 @@ discard block
		block discarded – undo
921	921	public function turn()
922	922	{
923	923	$this->setError('The SMTP TURN command is not implemented');
924		- $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
	924	+ $this->edebug('SMTP NOTICE: '.$this->error['error'], self::DEBUG_CLIENT);
925	925	return false;
926	926	}
927	927
		@@ -985,10 +985,10 @@ discard block
		block discarded – undo
985	985
986	986	// the tight logic knot ;)
987	987	if (!array_key_exists($name, $this->server_caps)) {
988		- if ($name == 'HELO') {
	988	+ if ($name=='HELO') {
989	989	return $this->server_caps['EHLO'];
990	990	}
991		- if ($name == 'EHLO' \|\| array_key_exists('EHLO', $this->server_caps)) {
	991	+ if ($name=='EHLO' \|\| array_key_exists('EHLO', $this->server_caps)) {
992	992	return false;
993	993	}
994	994	$this->setError('HELO handshake was used. Client knows nothing about server extensions');
		@@ -1027,7 +1027,7 @@ discard block
		block discarded – undo
1027	1027	$endtime = 0;
1028	1028	stream_set_timeout($this->smtp_conn, $this->Timeout);
1029	1029	if ($this->Timelimit > 0) {
1030		- $endtime = time() + $this->Timelimit;
	1030	+ $endtime = time()+$this->Timelimit;
1031	1031	}
1032	1032	while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
1033	1033	$str = @fgets($this->smtp_conn, 515);
		@@ -1036,14 +1036,14 @@ discard block
		block discarded – undo
1036	1036	$data .= $str;
1037	1037	$this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
1038	1038	// If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
1039		- if ((isset($str[3]) and $str[3] == ' ')) {
	1039	+ if ((isset($str[3]) and $str[3]==' ')) {
1040	1040	break;
1041	1041	}
1042	1042	// Timed-out? Log and break
1043	1043	$info = stream_get_meta_data($this->smtp_conn);
1044	1044	if ($info['timed_out']) {
1045	1045	$this->edebug(
1046		- 'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
	1046	+ 'SMTP -> get_lines(): timed-out ('.$this->Timeout.' sec)',
1047	1047	self::DEBUG_LOWLEVEL
1048	1048	);
1049	1049	break;
		@@ -1052,7 +1052,7 @@ discard block
		block discarded – undo
1052	1052	if ($endtime and time() > $endtime) {
1053	1053	$this->edebug(
1054	1054	'SMTP -> get_lines(): timelimit reached ('.
1055		- $this->Timelimit . ' sec)',
	1055	+ $this->Timelimit.' sec)',
1056	1056	self::DEBUG_LOWLEVEL
1057	1057	);
1058	1058	break;

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	while($row = mysqli_fetch_array($rs, MYSQL_ASSOC)){
33	33	if($row['monitorType']=='ip'){
34	34	$cacheData['ips'][] = $row['host'];
35		- }else{
	35	+ } else{
36	36	$cacheData['domains'][] = $row['host'];
37	37	}
38	38	}
		@@ -58,20 +58,20 @@ discard block
		block discarded – undo
58	58	if($r!='') {
59	59	self::$isBlocked = 1;
60	60	self::logBlockListStats($server, 'ip', true);
61		- }else{
	61	+ } else{
62	62	self::logBlockListStats($server, 'ip', false);
63	63	}
64	64	if($r!='' \|\| $reportClean==true) {
65	65	$return[] = array(trim($server),$r);
66	66	}
67	67	}
68		- }else{
	68	+ } else{
69	69	foreach(self::$domainBlacklists as $server){
70	70	$r = self::domainCheck($domainOrIp, $server);
71	71	if($r!='') {
72	72	self::$isBlocked = 1;
73	73	self::logBlockListStats($server, 'domain', true);
74		- }else{
	74	+ } else{
75	75	self::logBlockListStats($server, 'domain', false);
76	76	}
77	77	if($r!='' \|\| $reportClean==true) {
		@@ -113,17 +113,23 @@ discard block
		block discarded – undo
113	113	$testArray = explode("\t", $test);
114	114	$test = end($testArray);
115	115	$test = str_replace(array('\'','"'),'',$test);
116		- }else{
	116	+ } else{
117	117	$test = 'blocked';
118	118	}
119	119	}
120		- if(strripos($test,'not found')!==false) return '';
121		- if(strripos($test,'SERVFAIL')!==false) return '';
	120	+ if(strripos($test,'not found')!==false) {
	121	+ return '';
	122	+ }
	123	+ if(strripos($test,'SERVFAIL')!==false) {
	124	+ return '';
	125	+ }
122	126	return trim($test);
123	127	}
124	128
125	129	public static function ipCheck($ip, $server){
126		- if(_IpAddresses::isIPAddress($ip)===false) return '';
	130	+ if(_IpAddresses::isIPAddress($ip)===false) {
	131	+ return '';
	132	+ }
127	133	$server = trim($server);
128	134
129	135	$parts = explode('.', $ip);
		@@ -164,23 +170,31 @@ discard block
		block discarded – undo
164	170	$test = (isset($a[1])) ? 'Listed ' . $a[1] : $test2;
165	171	break;
166	172	}
167		- if($test2!='') $test = $test2;
168		- }else{
	173	+ if($test2!='') {
	174	+ $test = $test2;
	175	+ }
	176	+ } else{
169	177	$test = 'blocked';
170	178	}
171	179	}
172		- if(strripos($test,'not found')!==false) return '';
173		- if(strripos($test,'SERVFAIL')!==false) return '';
	180	+ if(strripos($test,'not found')!==false) {
	181	+ return '';
	182	+ }
	183	+ if(strripos($test,'SERVFAIL')!==false) {
	184	+ return '';
	185	+ }
174	186	return trim($test);
175	187	}
176	188
177	189	public static function logBlockListStats($server, $monitorType, $isBlocked){
178		- if(Setup::$settings['log_rbl_stats']==0) return true;
	190	+ if(Setup::$settings['log_rbl_stats']==0) {
	191	+ return true;
	192	+ }
179	193	$mysql = new _MySQL();
180	194	$mysql->connect(Setup::$connectionArray);
181	195	if($isBlocked){
182	196	$sql = "update blockLists set blocksToday=(blocksToday+1), lastBlockReport=now() where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
183		- }else{
	197	+ } else{
184	198	$sql = "update blockLists set cleanToday=(cleanToday+1) where host = '".$mysql->escape($server)."' and monitorType = '$monitorType';";
185	199	}
186	200	$mysql->runQuery($sql);
		@@ -202,7 +216,9 @@ discard block
		block discarded – undo
202	216	public static function updateDomains($domains, $monitorGroupId){
203	217	$domains = trim($domains);
204	218	$monitorGroupId = (int)$monitorGroupId;
205		- if($monitorGroupId===0) return false;
	219	+ if($monitorGroupId===0) {
	220	+ return false;
	221	+ }
206	222	$mysql = new _MySQL();
207	223	$mysql->connect(Setup::$connectionArray);
208	224	$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 1 and monitorGroupId = $monitorGroupId");
		@@ -241,7 +257,9 @@ discard block
		block discarded – undo
241	257	public static function updateIPs($ips, $monitorGroupId){
242	258	$ips = trim($ips);
243	259	$monitorGroupId = (int)$monitorGroupId;
244		- if($monitorGroupId===0) return false;
	260	+ if($monitorGroupId===0) {
	261	+ return false;
	262	+ }
245	263	$mysql = new _MySQL();
246	264	$mysql->connect(Setup::$connectionArray);
247	265	$mysql->runQuery("update monitors set keepOnUpdate = 0 where isDomain = 0 and monitorGroupId = $monitorGroupId");
		@@ -267,16 +285,25 @@ discard block
		block discarded – undo
267	285	keepOnUpdate = 1
268	286	");
269	287	}
270		- }else{
	288	+ } else{
271	289	//cidr /24's max...
272	290	if(trim($i)!=''){
273		- if(strpos($i, ' ')!==false) continue;
274		- if(strpos($i, ':')!==false) continue;
	291	+ if(strpos($i, ' ')!==false) {
	292	+ continue;
	293	+ }
	294	+ if(strpos($i, ':')!==false) {
	295	+ continue;
	296	+ }
275	297	$range = _IpAddresses::cidrToRange($i);
276		- if($range===false) continue;
	298	+ if($range===false) {
	299	+ continue;
	300	+ }
277	301	$start = explode('.', $range[0]);
278	302	$end = explode('.', $range[1]);
279		- if($range[0]==0) continue;// starts with 0
	303	+ if($range[0]==0) {
	304	+ continue;
	305	+ }
	306	+ // starts with 0
280	307	for($i = $start[3]; $i <= $end[3]; $i++){
281	308	$host = "{$start[0]}.{$start[1]}.{$start[2]}.$i";
282	309	if(_IpAddresses::isIPAddress($host)){
		@@ -308,7 +335,7 @@ discard block
		block discarded – undo
308	335	public static function isLoggedIn(){
309	336	if(isset($_SESSION['id']) && (int)$_SESSION['id'] > 0){
310	337	return $_SESSION['id'];
311		- }else{
	338	+ } else{
312	339	return false;
313	340	}
314	341	}
		@@ -353,7 +380,7 @@ discard block
		block discarded – undo
353	380	where ";
354	381	if(trim($apiKey) != ''){
355	382	$sql .= " apiKey = '".$mysql->escape($apiKey)."'";
356		- }else{
	383	+ } else{
357	384	$sql .= " passwd = '".$mysql->escape(md5($passwd))."'
358	385	and username = '".$mysql->escape($userName)."'";
359	386	}
		@@ -369,12 +396,12 @@ discard block
		block discarded – undo
369	396	public static function lookupHostDNS($host){
370	397	if(_IpAddresses::isIPAddress($host)){
371	398	return _IpAddresses::getHostByIp($host);
372		- }else{
	399	+ } else{
373	400	$host = escapeshellarg($host);
374	401	exec('host -t a -W 2 '.$host, $output, $return);
375	402	if ($return !== 0) {
376	403	return '';
377		- }else{
	404	+ } else{
378	405	$output = implode($output);
379	406	$ips = _IpAddresses::getAllIPsFromString($output, true);
380	407	$ir = "";
		@@ -404,7 +431,9 @@ discard block
		block discarded – undo
404	431	}
405	432
406	433	public static function makeAPICallback($url, $host, $isBlocked, $rDNS, $status){
407		- if(substr($url,0,4)!='http') return false;
	434	+ if(substr($url,0,4)!='http') {
	435	+ return false;
	436	+ }
408	437
409	438	$vars = json_encode(
410	439	array(
		@@ -424,7 +453,9 @@ discard block
		block discarded – undo
424	453	curl_setopt($ch,CURLOPT_POSTFIELDS,$vars);
425	454	curl_setopt($ch,CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
426	455	curl_exec($ch);
427		- if (curl_errno($ch)) $err = false;
	456	+ if (curl_errno($ch)) {
	457	+ $err = false;
	458	+ }
428	459	} catch (Exception $e) {
429	460	$err = false;
430	461	}
		@@ -449,10 +480,14 @@ discard block
		block discarded – undo
449	480	$endPos = 0;
450	481	while(true) {
451	482	$beginPos = stripos($text, $beginText, $endPos);
452		- if($beginPos===false) break;
	483	+ if($beginPos===false) {
	484	+ break;
	485	+ }
453	486	$beginPos = $beginPos+strlen($beginText);
454	487	$endPos = stripos($text, $endText, $beginPos);
455		- if($endPos===false) break;
	488	+ if($endPos===false) {
	489	+ break;
	490	+ }
456	491	$result = substr($text, $beginPos, $endPos-$beginPos);
457	492	if($removeSpace){
458	493	$result = str_replace("\t","",$result);
		@@ -465,8 +500,12 @@ discard block
		block discarded – undo
465	500	if($removeHtmlTags){
466	501	$result = strip_tags($result);
467	502	}
468		- if($firstResultOnlyNoArray) return $result;
469		- if($result != '') $results[] = $result;
	503	+ if($firstResultOnlyNoArray) {
	504	+ return $result;
	505	+ }
	506	+ if($result != '') {
	507	+ $results[] = $result;
	508	+ }
470	509	}
471	510	return ($firstResultOnlyNoArray && empty($results) ? '' : $results);
472	511	}
		@@ -480,40 +519,54 @@ discard block
		block discarded – undo
480	519	public static function getHostChangeCount($mysql, $monitorGroupId = 0) {
481	520	$sql = '';
482	521	$monitorGroupId = (int)$monitorGroupId;
483		- if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
	522	+ if($monitorGroupId > 0) {
	523	+ $sql = " and monitorGroupId = $monitorGroupId";
	524	+ }
484	525	return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where lastStatusChanged = 1 $sql");
485	526	}
486	527
487	528	public static function getHostErrorCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
488	529	$sql = '';
489	530	$monitorGroupId = (int)$monitorGroupId;
490		- if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
491		- if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
	531	+ if($monitorGroupId > 0) {
	532	+ $sql = " and monitorGroupId = $monitorGroupId";
	533	+ }
	534	+ if($onlyNew) {
	535	+ $sql .= " and lastStatusChanged = 1 ";
	536	+ }
492	537	return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 1 $sql");
493	538	}
494	539
495	540	public static function getHostCleanCount($mysql, $monitorGroupId = 0, $onlyNew = false) {
496	541	$sql = '';
497	542	$monitorGroupId = (int)$monitorGroupId;
498		- if($monitorGroupId > 0) $sql = " and monitorGroupId = $monitorGroupId";
499		- if($onlyNew) $sql .= " and lastStatusChanged = 1 ";
	543	+ if($monitorGroupId > 0) {
	544	+ $sql = " and monitorGroupId = $monitorGroupId";
	545	+ }
	546	+ if($onlyNew) {
	547	+ $sql .= " and lastStatusChanged = 1 ";
	548	+ }
500	549	return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors where isBlocked = 0 $sql");
501	550	}
502	551
503	552	public static function getHostCount($mysql, $monitorGroupId = 0) {
504	553	$sql = '';
505	554	$monitorGroupId = (int)$monitorGroupId;
506		- if($monitorGroupId > 0) $sql = " where monitorGroupId = $monitorGroupId";
	555	+ if($monitorGroupId > 0) {
	556	+ $sql = " where monitorGroupId = $monitorGroupId";
	557	+ }
507	558	return $mysql->runQueryReturnVar("select COALESCE(count(ipDomain),0) as cnt from monitors $sql");
508	559	}
509	560
510	561	//CREDIT: http://braincrafted.com/php-background-processes/
511	562	public static function is_process_running($pid){
512	563	$pid = (int)$pid;
513		- if($pid == 0) return false;
	564	+ if($pid == 0) {
	565	+ return false;
	566	+ }
514	567	if(file_exists('/proc/'.$pid)){
515	568	return true;
516		- }else{
	569	+ } else{
517	570	return false;
518	571	}
519	572	}
		@@ -522,7 +575,7 @@ discard block
		block discarded – undo
522	575	$log = Setup::$settings['log_path'];
523	576	if($priority !=0){
524	577	$pid = shell_exec("nohup nice -n $priority $command >> $log 2>&1 & echo $!");
525		- }else{
	578	+ } else{
526	579	$pid = shell_exec("nohup $command >> $log 2>&1 & echo $!");
527	580	}
528	581	return($pid);

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
6	6	class_exists('PHPMailer', false) or include('classes/class.phpmailer.php');
7	7
8		-if(Utilities::isLoggedIn()===false){
	8	+if (Utilities::isLoggedIn()===false) {
9	9	header('Location: login.php');
10	10	exit();
11	11	}
		@@ -13,17 +13,17 @@ discard block
		block discarded – undo
13	13	$titlePreFix = "account";
14	14	$message = array();
15	15
16		-$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']),0,100) : '';
17		-$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'],0,8000) : '';
18		-$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'],0,8000) : '';
19		-$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'],0,32) : '';
20		-$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'],0,32) : '';
21		-$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'],0,32) : '';
	16	+$username = array_key_exists('username', $_POST) ? substr(trim($_POST['username']), 0, 100) : '';
	17	+$noticeEmailAddresses = array_key_exists('noticeEmailAddresses', $_POST) ? substr($_POST['noticeEmailAddresses'], 0, 8000) : '';
	18	+$textMessageEmails = array_key_exists('textMessageEmails', $_POST) ? substr($_POST['textMessageEmails'], 0, 8000) : '';
	19	+$passwd = array_key_exists('passwd', $_POST) ? substr($_POST['passwd'], 0, 32) : '';
	20	+$passwdOld = array_key_exists('passwdOld', $_POST) ? substr($_POST['passwdOld'], 0, 32) : '';
	21	+$apiKey = array_key_exists('apiKey', $_POST) ? substr($_POST['apiKey'], 0, 32) : '';
22	22	$disableEmailNotices = array_key_exists('disableEmailNotices', $_POST) ? (int)$_POST['disableEmailNotices'] : 0;
23	23	$beenChecked = array_key_exists('beenChecked', $_POST) ? (int)$_POST['beenChecked'] : 0;
24		-$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']),0,15) : '';
25		-$twitterHandle = str_replace('@','',$twitterHandle);
26		-$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']),0,2000) : '';
	24	+$twitterHandle = array_key_exists('twitterHandle', $_POST) ? substr(trim($_POST['twitterHandle']), 0, 15) : '';
	25	+$twitterHandle = str_replace('@', '', $twitterHandle);
	26	+$apiCallbackURL = array_key_exists('apiCallbackURL', $_POST) ? substr(trim($_POST['apiCallbackURL']), 0, 2000) : '';
27	27	$testUrl = array_key_exists('testUrl', $_GET) ? $_GET['testUrl'] : '';
28	28
29	29	$mysql = new _MySQL();
		@@ -32,40 +32,40 @@ discard block
		block discarded – undo
32	32	// audit check frequency
33	33	$checkFrequency = array_key_exists('checkFrequency', $_POST) ? $_POST['checkFrequency'] : '';
34	34
35		-if($testUrl!=''){
36		- if(Utilities::testAPICallback($testUrl)){
	35	+if ($testUrl!='') {
	36	+ if (Utilities::testAPICallback($testUrl)) {
37	37	echo('true');
38		- }else{
	38	+ }else {
39	39	echo('false');
40	40	}
41	41	exit();
42	42	}
43	43
44	44	if (isset($_POST["submit"])) {
45		- if($passwd=='') $message[] = 'You must select a password.';
	45	+ if ($passwd=='') $message[] = 'You must select a password.';
46	46
47		- if($passwdOld != $passwd){
	47	+ if ($passwdOld!=$passwd) {
48	48	$passwdOld = md5($passwd);
49	49	}
50	50
51		- $ta = explode("\n",$noticeEmailAddresses);
	51	+ $ta = explode("\n", $noticeEmailAddresses);
52	52	$noticeEmailAddresses = "";
53		- foreach($ta as $e){
	53	+ foreach ($ta as $e) {
54	54	$e = trim($e);
55		- if(Utilities::isValidEmail($e)){
	55	+ if (Utilities::isValidEmail($e)) {
56	56	$noticeEmailAddresses .= "$e\n";
57	57	}
58	58	}
59		- $ta = explode("\n",$textMessageEmails);
	59	+ $ta = explode("\n", $textMessageEmails);
60	60	$textMessageEmails = "";
61		- foreach($ta as $e){
	61	+ foreach ($ta as $e) {
62	62	$e = trim($e);
63		- if(Utilities::isValidEmail($e)){
	63	+ if (Utilities::isValidEmail($e)) {
64	64	$textMessageEmails .= "$e\n";
65	65	}
66	66	}
67	67	//TODO: make sure blacklists are domains with an ip address on them
68		- if(count($message) == 0){
	68	+ if (count($message)==0) {
69	69	//update
70	70	$mysql->runQuery("
71	71	update users set username = '".$mysql->escape($username)."',
		@@ -81,11 +81,11 @@ discard block
		block discarded – undo
81	81	checkFrequency = '".$mysql->escape($checkFrequency)."',
82	82	disableEmailNotices = $disableEmailNotices
83	83	");
84		- if($beenChecked==1){
	84	+ if ($beenChecked==1) {
85	85	$mysql->runQuery("update users set beenChecked = 0");
86	86	$message[] = "Check scheduled.";
87	87	}
88		- if($twitterHandle!=''){
	88	+ if ($twitterHandle!='') {
89	89	$t = new Twitter();
90	90	$t->follow($twitterHandle);
91	91	}
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	}
94	94	}
95	95	$user = Utilities::getAccount();
96		-if(!$user){
	96	+if (!$user) {
97	97	//invalid account
98	98	echo("<script>window.location='login.php?logout=1';</script>");
99	99	exit();
		@@ -106,8 +106,8 @@ discard block
		block discarded – undo
106	106	<div class="row">
107	107	<div class="col-md-3">
108	108	<ul class="nav nav-pills nav-stacked">
109		- <li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql)));?></span></li>
110		- <li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql)));?></span></li>
	109	+ <li>Hosts Total <span class="badge pull-right"><?php echo(number_format(Utilities::getHostCount($mysql))); ?></span></li>
	110	+ <li>Hosts Blocked <span class="badge pull-right"><?php echo(number_format(Utilities::getHostErrorCount($mysql))); ?></span></li>
111	111	</ul>
112	112	</div>
113	113	</div>
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	</script>
137	137
138	138	<?php
139		-foreach($message as $m){
	139	+foreach ($message as $m) {
140	140	echo("<div class=\"alert alert-info alert-dismissable\"><button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-hidden=\"true\">×</button>$m</div>");
141	141	}
142	142	?>
		@@ -145,30 +145,30 @@ discard block
		block discarded – undo
145	145	<div class="form-group">
146	146	<label class="col-sm-3 control-label" for="username">Login Username</label>
147	147	<div class="col-sm-6">
148		- <input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']);?>" placeholder="username">
	148	+ <input class="form-control" type="text" id="username" name="username" value="<?php echo($user['username']); ?>" placeholder="username">
149	149	</div>
150	150	</div>
151	151	<div class="form-group">
152	152	<label class="col-sm-3 control-label" for="passwd">Password</label>
153	153	<div class="col-sm-6">
154		- <input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']);?>" class="form-control" placeholder="Password">
	154	+ <input class="form-control" type="password" name="passwd" id="passwd" value="<?php echo($user['passwd']); ?>" class="form-control" placeholder="Password">
155	155	</div>
156	156	</div>
157	157	<div class="form-group">
158	158	<label class="col-sm-3 control-label" for="apiKey">API Key</label>
159	159	<div class="col-sm-6">
160		- <input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']);?>" placeholder="api key">
	160	+ <input class="form-control" maxlength="32" type="text" id="apiKey" name="apiKey" value="<?php echo($user['apiKey']); ?>" placeholder="api key">
161	161	</div>
162	162	</div>
163	163	<div class="form-group">
164	164	<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
165	165	<div class="col-sm-6">
166	166	<select id="checkFrequency" name="checkFrequency" class="form-control">
167		- <option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
168		- <option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
169		- <option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
170		- <option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
171		- <option value="1hour"<?php if($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
	167	+ <option value="weekly"<?php if ($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
	168	+ <option value="daily"<?php if ($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
	169	+ <option value="8hour"<?php if ($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
	170	+ <option value="2hour"<?php if ($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
	171	+ <option value="1hour"<?php if ($user['checkFrequency']=='1hour') echo ' selected'?>>Hourly</option>
172	172	</select>
173	173	</div>
174	174	</div>
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190	<div class="col-sm-6">
191	191	<div class="input-group">
192	192	<span class="input-group-addon">@</span>
193		- <input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
	193	+ <input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']); ?>" placeholder="twitter username">
194	194	</div>
195	195	</div>
196	196	</div>
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	</label>
201	201	<div class="col-sm-6">
202	202	<div class="input-group">
203		- <input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']);?>" placeholder="api callback url">
	203	+ <input class="form-control" type="text" id="apiCallbackURL" name="apiCallbackURL" value="<?php echo($user['apiCallbackURL']); ?>" placeholder="api callback url">
204	204	<span class="input-group-btn">
205	205	<button class="btn btn-default" type="button" onclick="testAPIUrl()">Test Callback</button>
206	206	</span>
		@@ -209,7 +209,7 @@ discard block
		block discarded – undo
209	209	</div>
210	210	</div>
211	211	<div class="form-group">
212		- <label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
	212	+ <label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if ($user['disableEmailNotices']==1) echo(' checked'); ?>></label>
213	213	<div class="col-sm-6">
214	214	Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes. Useful if you have a frequently changing network. This does not pause api call backs.</small>
215	215	</div>
		@@ -225,7 +225,7 @@ discard block
		block discarded – undo
225	225	<button type="submit" name="submit" value="submit" class="btn btn-primary">Save changes</button>
226	226	</div>
227	227	</div>
228		- <input type="hidden" value="<?php echo($user['passwd']);?>" name="passwdOld"/>
	228	+ <input type="hidden" value="<?php echo($user['passwd']); ?>" name="passwdOld"/>
229	229	</form>
230	230
231	231	<br/><br/><br/><br/>

		@@ -35,14 +35,16 @@ discard block
		block discarded – undo
35	35	if($testUrl!=''){
36	36	if(Utilities::testAPICallback($testUrl)){
37	37	echo('true');
38		- }else{
	38	+ } else{
39	39	echo('false');
40	40	}
41	41	exit();
42	42	}
43	43
44	44	if (isset($_POST["submit"])) {
45		- if($passwd=='') $message[] = 'You must select a password.';
	45	+ if($passwd=='') {
	46	+ $message[] = 'You must select a password.';
	47	+ }
46	48
47	49	if($passwdOld != $passwd){
48	50	$passwdOld = md5($passwd);
		@@ -164,7 +166,8 @@ discard block
		block discarded – undo
164	166	<label class="col-sm-3 control-label" for="checkFrequency">Check Frequency</label>
165	167	<div class="col-sm-6">
166	168	<select id="checkFrequency" name="checkFrequency" class="form-control">
167		- <option value="weekly"<?php if($user['checkFrequency']=='weekly') echo ' selected'?>>Weekly</option>
	169	+ <option value="weekly"<?php if($user['checkFrequency']=='weekly') {
	170	+ echo ' selected'?>>Weekly</option>
168	171	<option value="daily"<?php if($user['checkFrequency']=='daily') echo ' selected'?>>Daily</option>
169	172	<option value="8hour"<?php if($user['checkFrequency']=='8hour') echo ' selected'?>>Every 8 Hours</option>
170	173	<option value="2hour"<?php if($user['checkFrequency']=='2hour') echo ' selected'?>>Every 2 Hours</option>
		@@ -190,7 +193,9 @@ discard block
		block discarded – undo
190	193	<div class="col-sm-6">
191	194	<div class="input-group">
192	195	<span class="input-group-addon">@</span>
193		- <input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);?>" placeholder="twitter username">
	196	+ <input class="form-control" type="text" id="twitterHandle" name="twitterHandle" value="<?php echo($user['twitterHandle']);
	197	+}
	198	+?>" placeholder="twitter username">
194	199	</div>
195	200	</div>
196	201	</div>
		@@ -209,7 +214,10 @@ discard block
		block discarded – undo
209	214	</div>
210	215	</div>
211	216	<div class="form-group">
212		- <label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) echo(' checked');?>></label>
	217	+ <label class="col-sm-3 control-label" for="disableEmailNotices"><input type="checkbox" id="disableEmailNotices" name="disableEmailNotices" value="1" class="input-block-level" <?php if($user['disableEmailNotices']==1) {
	218	+ echo(' checked');
	219	+}
	220	+?>></label>
213	221	<div class="col-sm-6">
214	222	Disable Notices<br/><small>You can pause receiving email/text alerts when your status changes. Useful if you have a frequently changing network. This does not pause api call backs.</small>
215	223	</div>

		@@ -1,8 +1,8 @@
		block discarded – undo
1	1	<div id="accountSubnav">
2	2	<ul class="nav nav-tabs">
3		- <li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
4		- <li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
5		- <li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
6		- <li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
	3	+ <li <?php if ($pageName=='account.php') echo('class="active"'); ?>><a href="account.php">Profile</a></li>
	4	+ <li <?php if ($pageName=='monitorGroup.php') echo('class="active"'); ?>><a href="monitorGroup.php">Monitor Groups</a></li>
	5	+ <li <?php if ($pageName=='blockLists.php') echo('class="active"'); ?>><a href="blockLists.php">Block Lists</a></li>
	6	+ <li <?php if ($pageName=='apiDocumentation.php') echo('class="active"'); ?>><a href="apiDocumentation.php">API Documentation</a></li>
7	7	</ul>
8	8	</div>
9	9	\ No newline at end of file

		@@ -1,8 +1,20 @@
		block discarded – undo
1	1	<div id="accountSubnav">
2	2	<ul class="nav nav-tabs">
3		- <li <?php if($pageName=='account.php') echo('class="active"');?>><a href="account.php">Profile</a></li>
4		- <li <?php if($pageName=='monitorGroup.php') echo('class="active"');?>><a href="monitorGroup.php">Monitor Groups</a></li>
5		- <li <?php if($pageName=='blockLists.php') echo('class="active"');?>><a href="blockLists.php">Block Lists</a></li>
6		- <li <?php if($pageName=='apiDocumentation.php') echo('class="active"');?>><a href="apiDocumentation.php">API Documentation</a></li>
	3	+ <li <?php if($pageName=='account.php') {
	4	+ echo('class="active"');
	5	+}
	6	+?>><a href="account.php">Profile</a></li>
	7	+ <li <?php if($pageName=='monitorGroup.php') {
	8	+ echo('class="active"');
	9	+}
	10	+?>><a href="monitorGroup.php">Monitor Groups</a></li>
	11	+ <li <?php if($pageName=='blockLists.php') {
	12	+ echo('class="active"');
	13	+}
	14	+?>><a href="blockLists.php">Block Lists</a></li>
	15	+ <li <?php if($pageName=='apiDocumentation.php') {
	16	+ echo('class="active"');
	17	+}
	18	+?>><a href="apiDocumentation.php">API Documentation</a></li>
7	19	</ul>
8	20	</div>
9	21	\ No newline at end of file

		@@ -24,51 +24,51 @@ discard block
		block discarded – undo
24	24	}
25	25
26	26	switch($type){
27		- case 'updateDomains':
28		- if($groupName=='') {
29		- $result['status'] = 'groupName is required';
	27	+ case 'updateDomains':
	28	+ if($groupName=='') {
	29	+ $result['status'] = 'groupName is required';
	30	+ break;
	31	+ }
	32	+ $id = Utilities::ensureGroupExists($groupName);
	33	+ Utilities::updateDomains($data, $id);
	34	+ $result['status'] = 'success';
30	35	break;
31		- }
32		- $id = Utilities::ensureGroupExists($groupName);
33		- Utilities::updateDomains($data, $id);
34		- $result['status'] = 'success';
35		- break;
36	36
37		- case 'updateIPs':
38		- if($groupName=='') {
39		- $result['status'] = 'groupName is required';
	37	+ case 'updateIPs':
	38	+ if($groupName=='') {
	39	+ $result['status'] = 'groupName is required';
	40	+ break;
	41	+ }
	42	+ $id = Utilities::ensureGroupExists($groupName);
	43	+ Utilities::updateIPs($data, $id);
	44	+ $result['status'] = 'success';
40	45	break;
41		- }
42		- $id = Utilities::ensureGroupExists($groupName);
43		- Utilities::updateIPs($data, $id);
44		- $result['status'] = 'success';
45		- break;
46	46
47		- case 'checkHostStatus':
48		- $result['status'] = 'success';
49		- Utilities::setBlockLists();
50		- $result['result'] = Utilities::checkBlacklists($data);
51		- break;
	47	+ case 'checkHostStatus':
	48	+ $result['status'] = 'success';
	49	+ Utilities::setBlockLists();
	50	+ $result['result'] = Utilities::checkBlacklists($data);
	51	+ break;
52	52
53		- case 'clearAllHostAndGroupData':
54		- $mysql = new _MySQL();
55		- $mysql->connect(Setup::$connectionArray);
56		- $mysql->runQuery("truncate table monitors");
57		- $mysql->runQuery("truncate table monitorGroup");
58		- $result['status'] = 'success';
59		- break;
	53	+ case 'clearAllHostAndGroupData':
	54	+ $mysql = new _MySQL();
	55	+ $mysql->connect(Setup::$connectionArray);
	56	+ $mysql->runQuery("truncate table monitors");
	57	+ $mysql->runQuery("truncate table monitorGroup");
	58	+ $result['status'] = 'success';
	59	+ break;
60	60
61		- case 'blacklistStatus':
62		- $localCache = new _FileCache('blacklistmonitor-api', 90);
63		- $cacheKey = md5("$username\|$passwd\|$apiKey\|$type\|$data");
64		- $cacheData = $localCache->get($cacheKey);
65		- if ($cacheData !== false) {
66		- output($cacheData);
67		- }
68		- $mysql = new _MySQL();
69		- $mysql->connect(Setup::$connectionArray);
70		- $searchSQL = '';
71		- switch($data){
	61	+ case 'blacklistStatus':
	62	+ $localCache = new _FileCache('blacklistmonitor-api', 90);
	63	+ $cacheKey = md5("$username\|$passwd\|$apiKey\|$type\|$data");
	64	+ $cacheData = $localCache->get($cacheKey);
	65	+ if ($cacheData !== false) {
	66	+ output($cacheData);
	67	+ }
	68	+ $mysql = new _MySQL();
	69	+ $mysql->connect(Setup::$connectionArray);
	70	+ $searchSQL = '';
	71	+ switch($data){
72	72	case 'changed':
73	73	$searchSQL .= " and lastStatusChanged = 1 ";
74	74	break;
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	break;
80	80	case 'all':
81	81	default:
82		- }
	82	+ }
83	83
84	84	$rs = $mysql->runQuery("
85	85	select ipDomain,isBlocked,rDNS,status,lastStatusChangeTime,lastUpdate
		@@ -101,8 +101,8 @@ discard block
		block discarded – undo
101	101	$localCache->set($cacheKey, $result);
102	102	break;
103	103
104		- default:
105		- $result['status'] = 'no such method';
	104	+ default:
	105	+ $result['status'] = 'no such method';
106	106	}
107	107
108	108	output();

		@@ -42,7 +42,7 @@
		block discarded – undo
42	42	domains = '".$mysql->escape($domains)."'
43	43	where id = $id
44	44	");
45		- }else{
	45	+ } else{
46	46	$mysql->runQuery("
47	47	insert into monitorGroup set groupName = '".$mysql->escape($groupName)."',
48	48	ips = '".$mysql->escape($ips)."',

		@@ -18,14 +18,14 @@ discard block
		block discarded – undo
18	18	);
19	19
20	20	$id = Utilities::validateLogin($username, $passwd, true, $apiKey);
21		-if($id == 0) {
	21	+if ($id==0) {
22	22	$result['status'] = 'invalid login';
23	23	output();
24	24	}
25	25
26		-switch($type){
	26	+switch ($type) {
27	27	case 'updateDomains':
28		- if($groupName=='') {
	28	+ if ($groupName=='') {
29	29	$result['status'] = 'groupName is required';
30	30	break;
31	31	}
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	break;
36	36
37	37	case 'updateIPs':
38		- if($groupName=='') {
	38	+ if ($groupName=='') {
39	39	$result['status'] = 'groupName is required';
40	40	break;
41	41	}
		@@ -62,13 +62,13 @@ discard block
		block discarded – undo
62	62	$localCache = new _FileCache('blacklistmonitor-api', 90);
63	63	$cacheKey = md5("$username\|$passwd\|$apiKey\|$type\|$data");
64	64	$cacheData = $localCache->get($cacheKey);
65		- if ($cacheData !== false) {
	65	+ if ($cacheData!==false) {
66	66	output($cacheData);
67	67	}
68	68	$mysql = new _MySQL();
69	69	$mysql->connect(Setup::$connectionArray);
70	70	$searchSQL = '';
71		- switch($data){
	71	+ switch ($data) {
72	72	case 'changed':
73	73	$searchSQL .= " and lastStatusChanged = 1 ";
74	74	break;
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87	where 1=1 $searchSQL");
88	88	$result['status'] = 'success';
89	89	$result['result'] = array();
90		- while($row = mysqli_fetch_array($rs)){
	90	+ while ($row = mysqli_fetch_array($rs)) {
91	91	$result['result'][] = array(
92	92	'host'=>$row['ipDomain'],
93	93	'isBlocked'=>$row['isBlocked'],
		@@ -107,11 +107,11 @@ discard block
		block discarded – undo
107	107
108	108	output();
109	109
110		-function output($data = false){
	110	+function output($data = false) {
111	111	global $result;
112		- if($data!==false){
	112	+ if ($data!==false) {
113	113	echo(json_encode($data));
114		- }else{
	114	+ }else {
115	115	echo(json_encode($result));
116	116	}
117	117	exit();

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2	class_exists('Setup', false) or include('classes/Setup.class.php');
3	3	class_exists('Utilities', false) or include('classes/Utilities.class.php');
4	4
5		-if(Utilities::isLoggedIn()===false){
	5	+if (Utilities::isLoggedIn()===false) {
6	6	header('Location: login.php');
7	7	exit();
8	8	}
		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	</tr>
29	29	<tr>
30	30	<td>apiKey</td>
31		- <td>Your api key: <?php echo $user['apiKey'];?></td>
	31	+ <td>Your api key: <?php echo $user['apiKey']; ?></td>
32	32	</tr>
33	33	<tr>
34	34	<td>type</td>
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	<br/>
66	66	<pre>
67	67	<?php
68		-$apiKey = '<?php echo $user['apiKey'];?>';
	68	+$apiKey = '<?php echo $user['apiKey']; ?>';
69	69
70	70	$requestBody =
71	71	"apiKey=".urlencode($apiKey).

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	update blockLists
22	22	set isActive = '0'
23	23	where md5(host) = '".$mysql->escape($host)."'");
24		- }else{
	24	+ } else{
25	25	$mysql->runQuery("
26	26	update blockLists
27	27	set isActive = '1'
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	echo('<td style="text-align: center;">');
104	104	if($row['isActive']==0){
105	105	echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
106		- }else{
	106	+ } else{
107	107	echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
108	108	}
109	109	echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	class_exists('Utilities', false) or include('classes/Utilities.class.php');
4	4	class_exists('_MySQL', false) or include('classes/_MySQL.class.php');
5	5
6		-if(Utilities::isLoggedIn()===false){
	6	+if (Utilities::isLoggedIn()===false) {
7	7	header('Location: login.php?location='.urlencode('hosts.php'));
8	8	exit();
9	9	}
		@@ -15,13 +15,13 @@ discard block
		block discarded – undo
15	15	$user = Utilities::getAccount();
16	16	$mysql = new _MySQL();
17	17	$mysql->connect(Setup::$connectionArray);
18		-if($host != ''){
19		- if($toggle==0){
	18	+if ($host!='') {
	19	+ if ($toggle==0) {
20	20	$mysql->runQuery("
21	21	update blockLists
22	22	set isActive = '0'
23	23	where md5(host) = '".$mysql->escape($host)."'");
24		- }else{
	24	+ }else {
25	25	$mysql->runQuery("
26	26	update blockLists
27	27	set isActive = '1'
		@@ -98,28 +98,28 @@ discard block
		block discarded – undo
98	98	</thead>
99	99	<tbody>
100	100	<?php
101		- while($row = mysqli_fetch_array($rs)){
	101	+ while ($row = mysqli_fetch_array($rs)) {
102	102	echo('<tr>');
103	103	echo('<td style="text-align: center;">');
104		- if($row['isActive']==0){
	104	+ if ($row['isActive']==0) {
105	105	echo('<a data-blstatus="0" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-remove" href="#"></a></td>');
106		- }else{
	106	+ }else {
107	107	echo('<a data-blstatus="1" data-host="'.md5($row['host']).'" id="'.md5($row['host']).'" class="blockListLinks glyphicon glyphicon-ok" href="#"></a></td>');
108	108	}
109	109	echo('<td style="white-space: nowrap"><a target="_blank" href="'.$row['website'].'">'.$row['host'].'</a></td>');
110	110	echo('<td style="white-space: nowrap">'.($row['monitorType']=='ip' ? 'IP' : 'Domain').'</td>');
111	111	echo('<td>'.$row['description'].'</td>');
112	112	echo('<td style="text-align: center;">');
113		- switch($row['importance']){
	113	+ switch ($row['importance']) {
114	114	case 3: echo('<span class="label label-primary">High</span>'); break;
115	115	case 2: echo('<span class="label label-info">Medium</span>'); break;
116	116	case 1: echo('<span class="label label-default">Low</span>'); break;
117	117	}
118	118	echo('</td>');
119		- echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'],0).'</td>');
120		- echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'],0).'</td>');
121		- echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'],0).'</td>');
122		- echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'],0).'</td>');
	119	+ echo('<td style="white-space: nowrap">'.number_format($row['blocksToday'], 0).'</td>');
	120	+ echo('<td style="white-space: nowrap">'.number_format($row['cleanToday'], 0).'</td>');
	121	+ echo('<td style="white-space: nowrap">'.number_format($row['blocksYesterday'], 0).'</td>');
	122	+ echo('<td style="white-space: nowrap">'.number_format($row['cleanYesterday'], 0).'</td>');
123	123	echo('</tr>');
124	124	}
125	125	$mysql->close();

		@@ -9,22 +9,22 @@ discard block
		block discarded – undo
9	9
10	10	public function __construct() {
11	11
12		- if(self::$instance===null){
	12	+ if (self::$instance===null) {
13	13
14		- if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
	14	+ if (!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
15	15	ini_set('error_reporting', E_ALL \| E_STRICT \| E_NOTICE);
16	16	$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
17	17	ini_set('display_errors', $cfg['display_errors']);
18	18	ini_set('error_log', $cfg['log_path']);
19	19
20	20	self::$settings = $cfg;
21		- self::$settings['dns_servers'] = explode(',',$cfg['dns_servers']);
	21	+ self::$settings['dns_servers'] = explode(',', $cfg['dns_servers']);
22	22
23	23	// clean up
24		- if(Setup::$settings['rbl_txt_extended_status']=='true' \|\|
25		- Setup::$settings['rbl_txt_extended_status']=='1'){
	24	+ if (Setup::$settings['rbl_txt_extended_status']=='true' \|\|
	25	+ Setup::$settings['rbl_txt_extended_status']=='1') {
26	26	Setup::$settings['rbl_txt_extended_status'] = true;
27		- }else{
	27	+ }else {
28	28	Setup::$settings['rbl_txt_extended_status'] = false;
29	29	}
30	30
		@@ -44,6 +44,6 @@ discard block
		block discarded – undo
44	44	}
45	45
46	46	Setup::$instance = new Setup();
47		-if(php_sapi_name()!=='cli'){
	47	+if (php_sapi_name()!=='cli') {
48	48	session_start();
49	49	}
50	50	\ No newline at end of file

		@@ -11,7 +11,9 @@ discard block
		block discarded – undo
11	11
12	12	if(self::$instance===null){
13	13
14		- if(!file_exists('/etc/blacklistmonitor.cfg')) echo('no config file in /etc/blacklistmonitor.cfg');
	14	+ if(!file_exists('/etc/blacklistmonitor.cfg')) {
	15	+ echo('no config file in /etc/blacklistmonitor.cfg');
	16	+ }
15	17	ini_set('error_reporting', E_ALL \| E_STRICT \| E_NOTICE);
16	18	$cfg = parse_ini_file('/etc/blacklistmonitor.cfg', false);
17	19	ini_set('display_errors', $cfg['display_errors']);
		@@ -24,7 +26,7 @@ discard block
		block discarded – undo
24	26	if(Setup::$settings['rbl_txt_extended_status']=='true' \|\|
25	27	Setup::$settings['rbl_txt_extended_status']=='1'){
26	28	Setup::$settings['rbl_txt_extended_status'] = true;
27		- }else{
	29	+ } else{
28	30	Setup::$settings['rbl_txt_extended_status'] = false;
29	31	}
30	32

mikelynn2 / blacklistmonitor

GitHub Access Token became invalid

Push — master ( 15bbb1...ec3fdd )

Status

Category

Doc Comments +8 added lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +17 added lines, -5 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Indentation +1104 added lines, -1104 removed lines patch added patch discarded remove patch

Doc Comments +22 added lines patch added patch discarded remove patch

Braces +93 added lines, -40 removed lines patch added patch discarded remove patch

Spacing +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +40 added lines, -40 removed lines patch added patch discarded remove patch

Braces +13 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Braces +16 added lines, -4 removed lines patch added patch discarded remove patch

Switch Indentation +42 added lines, -42 removed lines patch added patch discarded remove patch

Braces +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +4 added lines, -2 removed lines patch added patch discarded remove patch