terrylinooo / shieldon

src/Shieldon/Driver/FileDriver.php

Spacing +16 added lines, -16 removed lines

@@ -76,8 +76,8 @@ 
      */
     protected function doInitialize(bool $dbCheck = true): void
     {
-        if (! $this->isInitialized) {
-            if (! empty($this->channel)) {
+        if (!$this->isInitialized) {
+            if (!empty($this->channel)) {
                 $this->setChannel($this->channel);
             }
 
@@ -107,7 +107,7 @@ 
                     $it = new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS);
                     $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
     
-                    foreach($files as $file) {
+                    foreach ($files as $file) {
                         if ($file->isFile()) {
     
                             $content = json_decode(file_get_contents($file->getPath() . '/' . $file->getFilename()), true);
@@ -139,7 +139,7 @@ 
     {
         $results = [];
 
-        if (! file_exists($this->getFilename($ip, $type))) {
+        if (!file_exists($this->getFilename($ip, $type))) {
             return $results;
         }
 
@@ -159,7 +159,7 @@ 
                 $fileContent = file_get_contents($this->getFilename($ip, $type));
                 $resultData = json_decode($fileContent, true);
 
-                if (! empty($resultData['log_data'])) {
+                if (!empty($resultData['log_data'])) {
                     $results = $resultData['log_data']; 
                 }
                 break;
@@ -243,7 +243,7 @@ 
                 $it = new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS);
                 $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
     
-                foreach($files as $file) {
+                foreach ($files as $file) {
                     if ($file->isDir()) {
                         // @codeCoverageIgnoreStart
                         rmdir($file->getRealPath());
@@ -268,9 +268,9 @@ 
 
         // Check if are Shieldon directories removed or not.
         $result = (
-            ! is_dir($this->getDirectory('filter_log')) && 
-            ! is_dir($this->getDirectory('rule'))       && 
-            ! is_dir($this->getDirectory('session'))
+            !is_dir($this->getDirectory('filter_log')) && 
+            !is_dir($this->getDirectory('rule')) && 
+            !is_dir($this->getDirectory('session'))
         );
 
         $this->createDirectory();
@@ -289,18 +289,18 @@ 
 
         $checkingFile = $this->directory . '/' . $this->channel . '_' . $this->checkPoint;
 
-        if (! file_exists($checkingFile)) {
+        if (!file_exists($checkingFile)) {
             $originalUmask = umask(0);
 
-            if (! is_dir($this->getDirectory('filter_log'))) {
+            if (!is_dir($this->getDirectory('filter_log'))) {
                 $resultA = @mkdir($this->getDirectory('filter_log'), 0777, true);
             }
     
-            if (! is_dir($this->getDirectory('rule'))) {
+            if (!is_dir($this->getDirectory('rule'))) {
                 $resultB = @mkdir($this->getDirectory('rule'), 0777, true);
             }
     
-            if (! is_dir($this->getDirectory('session'))) {
+            if (!is_dir($this->getDirectory('session'))) {
                 $resultC = @mkdir($this->getDirectory('session'), 0777, true);
             }
 
@@ -324,7 +324,7 @@ 
      */
     protected function checkDirectory(): bool
     {
-        if (! is_dir($this->directory) || ! is_writable($this->directory)) {
+        if (!is_dir($this->directory) || !is_writable($this->directory)) {
             throw new RuntimeException('The directory defined by File Driver must be writable. (' . $this->directory . ')');
         }
 
@@ -358,8 +358,8 @@ 
 
         switch ($type) {
             case 'filter_log' : return $this->directory . '/' . $this->tableFilterLogs . '/' . $ip . '.' . $this->extension;
-            case 'session'    : return $this->directory . '/' . $this->tableSessions   . '/' . $ip . '.' . $this->extension;
-            case 'rule'       : return $this->directory . '/' . $this->tableRuleList   . '/' . $ip . '.' . $this->extension;
+            case 'session'    : return $this->directory . '/' . $this->tableSessions . '/' . $ip . '.' . $this->extension;
+            case 'rule'       : return $this->directory . '/' . $this->tableRuleList . '/' . $ip . '.' . $this->extension;
         }
 
         return '';

src/Shieldon/Driver/DriverProvider.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
     {
         $this->channel = $channel;
 
-        if (! empty($this->channel)) {
+        if (!empty($this->channel)) {
             $this->tableFilterLogs = $this->channel . '_shieldon_filter_logs';
             $this->tableRuleList = $this->channel . '_shieldon_rule_list';
             $this->tableSessions = $this->channel . '_shieldon_sessions';

src/Shieldon/Driver/SqlDriverProvider.php

Indentation +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
         return $results;
     }
 
-   /**
+    /**
      * {@inheritDoc}
      */
     protected function doFetchAll(string $type = 'filter_log'): array

Spacing +20 added lines, -20 removed lines

@@ -60,12 +60,12 @@ 
      */
     protected function doInitialize(bool $dbCheck = true): void
     {
-        if (! $this->isInitialized) {
-            if (! empty($this->channel)) {
+        if (!$this->isInitialized) {
+            if (!empty($this->channel)) {
                 $this->setChannel($this->channel);
             }
 
-            if ($dbCheck && ! $this->checkTableExists()) {
+            if ($dbCheck && !$this->checkTableExists()) {
                 $this->installSql();
             }
         }
@@ -93,7 +93,7 @@ 
                 $resultData = $query->fetch($this->db::FETCH_ASSOC);
 
                 // No data found.
-                if (is_bool($resultData) && ! $resultData) {
+                if (is_bool($resultData) && !$resultData) {
                     $resultData = [];
                 }
 
@@ -113,11 +113,11 @@ 
                 $resultData = $query->fetch($this->db::FETCH_ASSOC);
 
                 // No data found.
-                if (is_bool($resultData) && ! $resultData) {
+                if (is_bool($resultData) && !$resultData) {
                     $resultData = [];
                 }
 
-                if (! empty($resultData['log_data'])) {
+                if (!empty($resultData['log_data'])) {
                     $results = json_decode($resultData['log_data'], true); 
                 }
                 break;
@@ -133,7 +133,7 @@ 
                 $resultData = $query->fetch($this->db::FETCH_ASSOC);
 
                 // No data found.
-                if (is_bool($resultData) && ! $resultData) {
+                if (is_bool($resultData) && !$resultData) {
                     $resultData = [];
                 }
 
@@ -228,7 +228,7 @@ 
         $query->execute();
         $result = $query->fetch();
 
-        if (! empty($result[$field])) {
+        if (!empty($result[$field])) {
             return true; 
         }
 
@@ -277,9 +277,9 @@ 
     protected function doDelete(string $ip, string $type = 'filter_log'): bool
     {
         switch ($type) {
-            case 'rule'      : return $this->remove($this->tableRuleList,   ['log_ip' => $ip]);
+            case 'rule'      : return $this->remove($this->tableRuleList, ['log_ip' => $ip]);
             case 'filter_log': return $this->remove($this->tableFilterLogs, ['log_ip' => $ip]);
-            case 'session'   : return $this->remove($this->tableSessions,   ['id'     => $ip]);
+            case 'session'   : return $this->remove($this->tableSessions, ['id'     => $ip]);
         }
 
         return false;
@@ -305,14 +305,14 @@ 
     private function update(string $table, array $data, array $where)
     {
         $placeholder = [];
-        foreach($data as $k => $v) {
+        foreach ($data as $k => $v) {
             $placeholder[] = "$k = :$k";
         }
 
         $dataPlaceholder = implode(', ', $placeholder);
 
         $placeholder = [];
-        foreach($where as $k => $v) {
+        foreach ($where as $k => $v) {
             $placeholder[] = "$k = :$k";
         }
 
@@ -324,7 +324,7 @@ 
 
             $bind = array_merge($data, $where);
     
-            foreach($bind as $k => $v) {
+            foreach ($bind as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -352,7 +352,7 @@ 
 
         // @codeCoverageIgnoreStart
         
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             throw $e->getMessage();
             return false;
         }
@@ -372,7 +372,7 @@ 
     {
         $placeholderField = [];
         $placeholderValue = [];
-        foreach($data as $k => $v) {
+        foreach ($data as $k => $v) {
             $placeholderField[] = "`$k`";
             $placeholderValue[] = ":$k";
         }
@@ -384,7 +384,7 @@ 
             $sql = 'INSERT INTO ' . $table . ' (' . $dataPlaceholderField . ') VALUES (' . $dataPlaceholderValue . ')';
             $query = $this->db->prepare($sql);
 
-            foreach($data as $k => $v) {
+            foreach ($data as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -412,7 +412,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 
@@ -431,7 +431,7 @@ 
     {
 
         $placeholder = [];
-        foreach($where as $k => $v) {
+        foreach ($where as $k => $v) {
             $placeholder[] = "`$k` = :$k";
         }
 
@@ -442,7 +442,7 @@ 
             $sql = 'DELETE FROM ' . $table . ' WHERE ' . $dataPlaceholder;
             $query = $this->db->prepare($sql);
 
-            foreach($where as $k => $v) {
+            foreach ($where as $k => $v) {
 
                 // @codeCoverageIgnoreStart
 
@@ -465,7 +465,7 @@ 
 
         // @codeCoverageIgnoreStart
 
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             return false;
         }
 

src/Shieldon/Driver/SqliteDriver.php

Indentation +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@
         parent::__construct($pdo, $debug);
     }
 
-      /**
-     * Create SQL tables that Shieldon needs.
-     *
-     * @return bool
-     */
+        /**
+         * Create SQL tables that Shieldon needs.
+         *
+         * @return bool
+         */
     protected function installSql(): bool
     {
         try {

src/Shieldon/IpTrait.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function setIp(string $ip = '', $queryRdns = false): void
     {
-        if (! empty($ip)) {
+        if (!empty($ip)) {
             $_SERVER['REMOTE_ADDR'] = $ip;
         }
 
@@ -55,8 +55,8 @@ 
 
             // Check if your IP is from localhost, perhaps your are in development environment?
             if (
-                (substr($this->ip, 0 , 8) === '192.168.') ||
-                (substr($this->ip, 0 , 6) === '127.0.')
+                (substr($this->ip, 0, 8) === '192.168.') ||
+                (substr($this->ip, 0, 6) === '127.0.')
             ) {
                 $this->setRdns('localhost');
             } else {

src/Shieldon/Captcha/ImageCaptcha.php

Spacing +7 added lines, -7 removed lines

@@ -89,12 +89,12 @@ 
             }
         }
 
-        if (! is_array($this->properties['colors'])) {
+        if (!is_array($this->properties['colors'])) {
             $this->properties['colors'] = $defaults['colors'];
         }
 
         foreach ($defaults['colors'] as $k => $v) {
-            if (! is_array($this->properties['colors'][$k])) {
+            if (!is_array($this->properties['colors'][$k])) {
                 $this->properties['colors'][$k] = $defaults['colors'][$k];
             }
         }
@@ -131,7 +131,7 @@ 
     public function form(): string
     {
         // @codeCoverageIgnoreStart
-        if (! extension_loaded('gd')) {
+        if (!extension_loaded('gd')) {
             return '';
         }
         // @codeCoverageIgnoreEnd
@@ -139,7 +139,7 @@ 
         $html = '';
         $base64image = $this->createCaptcha();
 
-        if (! empty($base64image)) {
+        if (!empty($base64image)) {
             $html = '<div style="padding: 0px; overflow: hidden; margin: 10px 0;">';
             $html .= '<div style="
                 border: 1px #dddddd solid;
@@ -208,7 +208,7 @@ 
         imagefilledrectangle($im, 0, 0, $this->properties['img_width'], $this->properties['img_height'], $colors['background']);
 
         // Create the spiral pattern.
-        $theta		= 1;
+        $theta = 1;
         $thetac		= 7;
         $radius		= 16;
         $circles	= 20;
@@ -237,7 +237,7 @@ 
         $y = 0;
 
         for ($i = 0; $i < $length; $i++) {
-            $y = mt_rand(0 , $this->properties['img_height'] / 2);
+            $y = mt_rand(0, $this->properties['img_height'] / 2);
             imagestring($im, 5, $x, $y, $this->word[$i], $colors['text']);
             $x += ($this->properties['font_spacing'] * 2);
         }
@@ -246,7 +246,7 @@ 
         imagerectangle($im, 0, 0, $this->properties['img_width'] - 1, $this->properties['img_height'] - 1, $colors['border']);
 
         // Generate image in base64 string.
-        ob_start ();
+        ob_start();
 
         if (function_exists('imagejpeg')) {
             $this->imageType = 'jpeg';

src/Shieldon/FirewallPanel.php

Indentation +3 added lines, -3 removed lines

@@ -192,7 +192,7 @@ 
         }
     }
 
-     // @codeCoverageIgnoreStart
+        // @codeCoverageIgnoreStart
 
     /**
      * Display pages.
@@ -1308,7 +1308,7 @@ 
         $iptablesQueueFile = $iptablesWatchingFolder . '/iptables_queue.log';
 
         if (
-               (isset($_POST['ip'])       && (filter_var(explode('/', $_POST['ip'])[0], FILTER_VALIDATE_IP)))
+                (isset($_POST['ip'])       && (filter_var(explode('/', $_POST['ip'])[0], FILTER_VALIDATE_IP)))
             && (isset($_POST['port'])     && (is_numeric($_POST['port']) || ($_POST['port'] === 'all') || ($_POST['port'] === 'custom')))
             && (isset($_POST['subnet'])   && (is_numeric($_POST['subnet']) || ($_POST['subnet'] === 'null')))
             && (isset($_POST['protocol']) && (in_array($_POST['protocol'], ['tcp', 'udp', 'all'])))
@@ -2252,7 +2252,7 @@ 
                 $channel = $_GET['channel'] ?? '';
 
                 if (
-                       ! empty($serverUrl) 
+                        ! empty($serverUrl) 
                     && ! empty($userId)
                     && ! empty($accessToken)
                     && ! empty($channel)

Spacing +89 added lines, -89 removed lines

@@ -168,7 +168,7 @@ 
             $this->filename      = $instance->getFilename();
         }
 
-        if (! empty($this->shieldon->logger)) {
+        if (!empty($this->shieldon->logger)) {
 
             // We need to know where the logs stored in.
             $logDirectory = $this->shieldon->logger->getDirectory();
@@ -186,7 +186,7 @@ 
         }
 
         // Flash message, use it when redirecting page.
-        if (! empty($_SESSION['flash_messages'])) {
+        if (!empty($_SESSION['flash_messages'])) {
             $this->messages = $_SESSION['flash_messages'];
             unset($_SESSION['flash_messages']);
         }
@@ -205,7 +205,7 @@ 
     {
         $this->locate = 'en';
 
-        if (! empty($_SESSION['SHIELDON_PANEL_LANG'])) {
+        if (!empty($_SESSION['SHIELDON_PANEL_LANG'])) {
             $this->locate = $_SESSION['SHIELDON_PANEL_LANG'];
         }
 
@@ -231,7 +231,7 @@ 
             unset($_POST);
         }
 
-        switch($slug) {
+        switch ($slug) {
 
             case 'overview':
                 $this->overview();
@@ -348,15 +348,15 @@ 
 
         } elseif (2 === count($csrfparams)) {
 
-            if (! empty($csrfparams[0]) && is_string($csrfparams[0])) {
+            if (!empty($csrfparams[0]) && is_string($csrfparams[0])) {
                 $csrfKey = $csrfparams[0];
             }
     
-            if (! empty($csrfparams[1]) && is_string($csrfparams[1])) {
+            if (!empty($csrfparams[1]) && is_string($csrfparams[1])) {
                 $csrfValue = $csrfparams[1];
             }
 
-            if (! empty($csrfKey)) {
+            if (!empty($csrfKey)) {
                 $this->csrfField[] = [
                     'name' => $csrfKey,
                     'value' => $csrfValue,
@@ -372,7 +372,7 @@ 
      */
     public function _csrf(): void
     {
-        if (! empty($this->csrfField)) {
+        if (!empty($this->csrfField)) {
             foreach ($this->csrfField as $value) {
                 echo '<input type="hidden" name="' . $value['name'] . '" value="' . $value['value'] . '" id="csrf-field">';
             }
@@ -389,11 +389,11 @@ 
      */
     public function demo(string $user = '', string $pass = ''): void
     {
-        if (! empty($user)) {
+        if (!empty($user)) {
             $this->demoUser['user'] = $user;
         }
 
-        if (! empty($pass)) {
+        if (!empty($pass)) {
             $this->demoUser['pass'] = $pass;
         }
 
@@ -435,7 +435,7 @@ 
 
             if (
                 // Default password, unencrypted.
-                $admin['user']  === $_POST['s_user'] && 
+                $admin['user'] === $_POST['s_user'] && 
                 'shieldon_pass' === $_POST['s_pass'] &&
                 'shieldon_pass' === $admin['pass']
             ) {
@@ -461,7 +461,7 @@ 
 
             // Check the response from Captcha modules.
             foreach ($this->captcha as $captcha) {
-                if (! $captcha->response()) {
+                if (!$captcha->response()) {
                     $login = false;
                     $data['error'] = __('panel', 'login_message_invalid_captcha', 'Invalid Captcha code.');
                 }
@@ -552,7 +552,7 @@ 
 
         $data['action_logger'] = false;
 
-        if (! empty($this->shieldon->logger)) {
+        if (!empty($this->shieldon->logger)) {
             $loggerInfo = $this->shieldon->logger->getCurrentLoggerInfo();
             $data['action_logger'] = true;
         }
@@ -561,7 +561,7 @@ 
         $data['logger_work_days'] = '0 day';
         $data['logger_total_size'] = '0 MB';
 
-        if (! empty($loggerInfo)) {
+        if (!empty($loggerInfo)) {
 
             $i = 0;
             ksort($loggerInfo);
@@ -609,11 +609,11 @@ 
         */
 
         $data['components'] = [
-            'Ip'         => (! empty($this->shieldon->component['Ip']))         ? true : false,
-            'TrustedBot' => (! empty($this->shieldon->component['TrustedBot'])) ? true : false,
-            'Header'     => (! empty($this->shieldon->component['Header']))     ? true : false,
-            'Rdns'       => (! empty($this->shieldon->component['Rdns']))       ? true : false,
-            'UserAgent'  => (! empty($this->shieldon->component['UserAgent']))  ? true : false,
+            'Ip'         => (!empty($this->shieldon->component['Ip'])) ? true : false,
+            'TrustedBot' => (!empty($this->shieldon->component['TrustedBot'])) ? true : false,
+            'Header'     => (!empty($this->shieldon->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->shieldon->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->shieldon->component['UserAgent'])) ? true : false,
         ];
 
         $reflection = new ReflectionObject($this->shieldon);
@@ -706,11 +706,11 @@ 
     protected function operationStatus(): void
     {
         $data['components'] = [
-            'Ip'         => (! empty($this->shieldon->component['Ip']))         ? true : false,
-            'TrustedBot' => (! empty($this->shieldon->component['TrustedBot'])) ? true : false,
-            'Header'     => (! empty($this->shieldon->component['Header']))     ? true : false,
-            'Rdns'       => (! empty($this->shieldon->component['Rdns']))       ? true : false,
-            'UserAgent'  => (! empty($this->shieldon->component['UserAgent']))  ? true : false,
+            'Ip'         => (!empty($this->shieldon->component['Ip'])) ? true : false,
+            'TrustedBot' => (!empty($this->shieldon->component['TrustedBot'])) ? true : false,
+            'Header'     => (!empty($this->shieldon->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->shieldon->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->shieldon->component['UserAgent'])) ? true : false,
         ];
 
         $reflection = new ReflectionObject($this->shieldon);
@@ -883,7 +883,7 @@ 
 
                 $newIpList = [];
 
-                if (! empty($ipList)) {
+                if (!empty($ipList)) {
                     foreach ($ipList as $i => $ipInfo) {
                         $key = $i + 1;
                         if ($order === $i) {
@@ -1026,7 +1026,7 @@ 
             $order = (int) $_POST['order'];
 
             // Check variable name. Should be mixed with a-zA-Z and underscore.
-            if (! ctype_alnum(str_replace('_', '', $variable))) {
+            if (!ctype_alnum(str_replace('_', '', $variable))) {
 
                 // Ignore the `add` process.
                 $action = 'undefined';
@@ -1098,7 +1098,7 @@ 
         
         $lastCachedTime = '';
 
-        if (! empty($this->parser)) {
+        if (!empty($this->parser)) {
 
             $logCacheHandler = new ActionLogParsedCache($this->parser->getDirectory());
 
@@ -1106,13 +1106,13 @@ 
 
             // If we have cached data then we don't need to parse them again.
             // This will save a lot of time in parsing logs.
-            if (! empty($ipDetailsCachedData)) {
+            if (!empty($ipDetailsCachedData)) {
 
                 $data['ip_details'] = $ipDetailsCachedData['ip_details'];
                 $data['period_data'] = $ipDetailsCachedData['period_data'];
                 $lastCachedTime = date('Y-m-d H:i:s', $ipDetailsCachedData['time']);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $ipDetailsCachedData = $logCacheHandler->get('past_seven_hours');
                     $data['past_seven_hours'] = $ipDetailsCachedData['period_data'];
                 }
@@ -1126,7 +1126,7 @@ 
 
                 $logCacheHandler->save($type, $data);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $this->parser->prepare('past_seven_hours');
                     $data['past_seven_hours'] = $this->parser->getParsedPeriodData();
 
@@ -1308,11 +1308,11 @@ 
         $iptablesQueueFile = $iptablesWatchingFolder . '/iptables_queue.log';
 
         if (
-               (isset($_POST['ip'])       && (filter_var(explode('/', $_POST['ip'])[0], FILTER_VALIDATE_IP)))
-            && (isset($_POST['port'])     && (is_numeric($_POST['port']) || ($_POST['port'] === 'all') || ($_POST['port'] === 'custom')))
-            && (isset($_POST['subnet'])   && (is_numeric($_POST['subnet']) || ($_POST['subnet'] === 'null')))
+               (isset($_POST['ip']) && (filter_var(explode('/', $_POST['ip'])[0], FILTER_VALIDATE_IP)))
+            && (isset($_POST['port']) && (is_numeric($_POST['port']) || ($_POST['port'] === 'all') || ($_POST['port'] === 'custom')))
+            && (isset($_POST['subnet']) && (is_numeric($_POST['subnet']) || ($_POST['subnet'] === 'null')))
             && (isset($_POST['protocol']) && (in_array($_POST['protocol'], ['tcp', 'udp', 'all'])))
-            && (isset($_POST['action'])   && (in_array($_POST['action'], ['allow', 'deny'])))
+            && (isset($_POST['action']) && (in_array($_POST['action'], ['allow', 'deny'])))
         ) {
             $ip       = $_POST['ip'];
             $port     = $_POST['port'];
@@ -1360,7 +1360,7 @@ 
             // Add a command to the watching file.
             file_put_contents($iptablesQueueFile, $applyCommand . "\n", FILE_APPEND | LOCK_EX);
 
-            if (! $isRemoval) {
+            if (!$isRemoval) {
 
                 // Becase we need system cronjob done, and then the web page will show the actual results.
                 sleep(10);
@@ -1382,7 +1382,7 @@ 
                 $line = trim($file->fgets());
                 $ipInfo = explode(',', $line);
 
-                if (! empty($ipInfo[4])) {
+                if (!empty($ipInfo[4])) {
                     $ipCommand[] = $ipInfo;
                 }
             }
@@ -1463,7 +1463,7 @@ 
                 $line = trim($file->fgets());
                 $ipInfo = explode(',', $line);
 
-                if (! empty($ipInfo[4])) {
+                if (!empty($ipInfo[4])) {
                     $ipv6Command[] = $ipInfo;
                 }
             }
@@ -1514,12 +1514,12 @@ 
         $configFilePath = $this->directory . '/' . $this->filename;
 
         foreach ($this->csrfField as $csrfInfo) {
-            if (! empty($csrfInfo['name'])) {
+            if (!empty($csrfInfo['name'])) {
                 unset($_POST[$csrfInfo['name']]);
             }
         }
 
-        if (empty($_POST) || ! is_array($_POST) || 'managed' !== $this->mode) {
+        if (empty($_POST) || !is_array($_POST) || 'managed' !== $this->mode) {
             return;
         }
 
@@ -1553,7 +1553,7 @@ 
                     } else {
                         if (is_numeric($postData)) {
                             $this->setConfig(str_replace('__', '.', $postKey), (int) $postData);
-                        } else  {
+                        } else {
                             $this->setConfig(str_replace('__', '.', $postKey), $postData);
                         }
                     }
@@ -1583,7 +1583,7 @@ 
                             (string) $db['user'],
                             (string) $db['pass']
                         );
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $isDataDriverFailed = true;
                         $this->responseMessage('error', 
                             __(
@@ -1617,8 +1617,8 @@ 
                 $sqliteFilePath = $sqliteDir . '/shieldon.sqlite3';
                 $this->setConfig('drivers.sqlite.directory_path', $sqliteDir);
                 
-                if (! file_exists($sqliteFilePath)) {
-                    if (! is_dir($sqliteDir)) {
+                if (!file_exists($sqliteFilePath)) {
+                    if (!is_dir($sqliteDir)) {
                         $originalUmask = umask(0);
                         @mkdir($sqliteDir, 0777, true);
                         umask($originalUmask);
@@ -1628,7 +1628,7 @@ 
                 if (class_exists('PDO')) {
                     try {
                         $pdo = new PDO('sqlite:' . $sqliteFilePath);
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         $isDataDriverFailed = true;
                         $this->responseMessage('error', $e->getMessage());
                     }
@@ -1643,7 +1643,7 @@ 
                     );
                 }
 
-                if (! is_writable($sqliteFilePath)) {
+                if (!is_writable($sqliteFilePath)) {
                     $isDataDriverFailed = true;
                     $this->responseMessage('error',
                         __(
@@ -1663,9 +1663,9 @@ 
                         $redis = new Redis();
                         $redis->connect(
                             (string) $this->getConfig('drivers.redis.host'), 
-                            (int)    $this->getConfig('drivers.redis.port')
+                            (int) $this->getConfig('drivers.redis.port')
                         );
-                    } catch(RedisException $e) {
+                    } catch (RedisException $e) {
                         $isDataDriverFailed = true;
                         $this->responseMessage('error', $e->getMessage());
                     }
@@ -1694,13 +1694,13 @@ 
 
                 $this->setConfig('drivers.file.directory_path', $fileDir);
 
-                if (! is_dir($fileDir)) {
+                if (!is_dir($fileDir)) {
                     $originalUmask = umask(0);
                     @mkdir($fileDir, 0777, true);
                     umask($originalUmask);
                 }
 
-                if (! is_writable($fileDir)) {
+                if (!is_writable($fileDir)) {
                     $isDataDriverFailed = true;
                     $this->responseMessage('error',
                         __(
@@ -1724,13 +1724,13 @@ 
 
             $this->setConfig('loggers.action.config.directory_path', $actionLogDir);
     
-            if (! is_dir($actionLogDir)) {
+            if (!is_dir($actionLogDir)) {
                 $originalUmask = umask(0);
                 @mkdir($actionLogDir, 0777, true);
                 umask($originalUmask);
             }
     
-            if (! is_writable($actionLogDir)) {
+            if (!is_writable($actionLogDir)) {
                 $isDataDriverFailed = true;
                 $this->responseMessage('error',
                     __(
@@ -1753,7 +1753,7 @@ 
 
             $this->setConfig('iptables.config.watching_folder', $iptablesWatchingFolder);
 
-            if (! is_dir($iptablesWatchingFolder)) {
+            if (!is_dir($iptablesWatchingFolder)) {
                 $originalUmask = umask(0);
                 @mkdir($iptablesWatchingFolder, 0777, true);
                 umask($originalUmask);
@@ -1761,14 +1761,14 @@ 
                 // Create default log files.
                 if (is_writable($iptablesWatchingFolder)) {
                     fopen($iptablesWatchingFolder . '/iptables_queue.log', 'w+');
-                    fopen($iptablesWatchingFolder . '/ipv4_status.log',    'w+');
-                    fopen($iptablesWatchingFolder . '/ipv6_status.log',    'w+');
-                    fopen($iptablesWatchingFolder . '/ipv4_command.log',   'w+');
-                    fopen($iptablesWatchingFolder . '/ipv6_command.log',   'w+');
+                    fopen($iptablesWatchingFolder . '/ipv4_status.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv6_status.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv4_command.log', 'w+');
+                    fopen($iptablesWatchingFolder . '/ipv6_command.log', 'w+');
                 }
             }
     
-            if (! is_writable($iptablesWatchingFolder)) {
+            if (!is_writable($iptablesWatchingFolder)) {
                 $isDataDriverFailed = true;
                 $this->responseMessage('error',
                     __(
@@ -1781,7 +1781,7 @@ 
         }
 
         // Only update settings while data driver is correctly connected.
-        if (! $isDataDriverFailed) {
+        if (!$isDataDriverFailed) {
             file_put_contents($configFilePath, json_encode($this->configuration));
 
             $this->responseMessage('success',
@@ -1824,11 +1824,11 @@ 
             die('Not allowed to view this page.');
         }
 
-        if (! empty($_FILES['json_file']['tmp_name'])) {
+        if (!empty($_FILES['json_file']['tmp_name'])) {
             $importedFileContent = file_get_contents($_FILES['json_file']['tmp_name']);
         }
 
-        if (! empty($importedFileContent)) {
+        if (!empty($importedFileContent)) {
             $jsonData = json_decode($importedFileContent, true);
 
             if (json_last_error() !== JSON_ERROR_NONE) {
@@ -1848,7 +1848,7 @@ 
             $checkFileVaild = true;
 
             foreach (array_keys($this->configuration) as $key) {
-                if (! isset($jsonData[$key])) {
+                if (!isset($jsonData[$key])) {
                     $checkFileVaild = false;
                 }
             }
@@ -1934,11 +1934,11 @@ 
                 if (in_array($field, $hiddenForDemo)) {
                     echo __('panel', 'field_not_visible', 'Cannot view this field in demo mode.');
                 } else {
-                    echo (! empty($this->getConfig($field))) ? $this->getConfig($field) : $default;
+                    echo (!empty($this->getConfig($field))) ? $this->getConfig($field) : $default;
                 }
 
             } else {
-                echo (! empty($this->getConfig($field))) ? $this->getConfig($field) : $default;
+                echo (!empty($this->getConfig($field))) ? $this->getConfig($field) : $default;
             }
         } elseif (is_array($this->getConfig($field))) {
 
@@ -2032,13 +2032,13 @@ 
      */
     private function loadView(string $page, array $data = [], $echo = false)
     {
-        if (! defined('SHIELDON_VIEW')) {
+        if (!defined('SHIELDON_VIEW')) {
             define('SHIELDON_VIEW', true);
         }
 
-        $viewFilePath =  __DIR__ . '/../../templates/' . $page . '.php';
+        $viewFilePath = __DIR__ . '/../../templates/' . $page . '.php';
     
-        if (! empty($data)) {
+        if (!empty($data)) {
             extract($data);
         }
 
@@ -2069,7 +2069,7 @@ 
      */
     private function _include(string $page, array $data = []): void
     {
-        if (! defined('SHIELDON_VIEW')) {
+        if (!defined('SHIELDON_VIEW')) {
             define('SHIELDON_VIEW', true);
         }
 
@@ -2147,8 +2147,8 @@ 
         $path = parse_url($httpProtocal . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], PHP_URL_PATH);
 
         $url = $httpProtocal . $_SERVER['HTTP_HOST'] . $path;
-        $soPage = (! empty($page)) ? '?so_page=' . $page : '';
-        $soTab = (! empty($tab)) ? '&tab=' . $tab : '';
+        $soPage = (!empty($page)) ? '?so_page=' . $page : '';
+        $soTab = (!empty($tab)) ? '&tab=' . $tab : '';
 
         return $url . $soPage . $soTab;
     }
@@ -2160,7 +2160,7 @@ 
      */
     private function httpAuth(): void
     {
-        if (! isset($_SESSION['SHIELDON_USER_LOGIN'])) {
+        if (!isset($_SESSION['SHIELDON_USER_LOGIN'])) {
             $this->login();
         }
     }
@@ -2201,12 +2201,12 @@ 
         $testMsgTitle = __('panel', 'test_msg_title', 'Testing Message from Host: ') . $_SERVER['SERVER_ADDR'];
         $testMsgBody = __('panel', 'test_msg_body', 'Messenger module "{0}" has been tested and confirmed successfully.', [$moduleName]);
     
-        switch($moduleName) {
+        switch ($moduleName) {
 
             case 'telegram':
                 $apiKey = $_GET['apiKey'] ?? '';
                 $channel = $_GET['channel'] ?? '';
-                if (! empty($apiKey) && ! empty($channel)) {
+                if (!empty($apiKey) && !empty($channel)) {
                     $messenger = new MessengerModule\Telegram($apiKey, $channel);
                     if ($messenger->send($testMsgBody)) {
                         $response['status'] = 'success';
@@ -2216,7 +2216,7 @@ 
 
             case 'line-notify':
                 $accessToken = $_GET['accessToken'] ?? '';
-                if (! empty($accessToken)) {
+                if (!empty($accessToken)) {
                     $messenger = new MessengerModule\LineNotify($accessToken);
                     if ($messenger->send($testMsgBody)) {
                         $response['status'] = 'success';
@@ -2227,7 +2227,7 @@ 
             case 'slack':
                 $botToken = $_GET['botToken'] ?? '';
                 $channel = $_GET['channel'] ?? '';
-                if (! empty($botToken) && ! empty($channel)) {
+                if (!empty($botToken) && !empty($channel)) {
                     $messenger = new MessengerModule\Slack($botToken, $channel);
                     if ($messenger->send($testMsgBody)) {
                         $response['status'] = 'success';
@@ -2237,7 +2237,7 @@ 
 
             case 'slack-webhook':
                 $webhookUrl = $_GET['webhookUrl'] ?? '';
-                if (! empty($webhookUrl)) {
+                if (!empty($webhookUrl)) {
                     $messenger = new MessengerModule\SlackWebhook($webhookUrl);
                     if ($messenger->send($testMsgBody)) {
                         $response['status'] = 'success';
@@ -2252,10 +2252,10 @@ 
                 $channel = $_GET['channel'] ?? '';
 
                 if (
-                       ! empty($serverUrl) 
-                    && ! empty($userId)
-                    && ! empty($accessToken)
-                    && ! empty($channel)
+                       !empty($serverUrl) 
+                    && !empty($userId)
+                    && !empty($accessToken)
+                    && !empty($channel)
                 ) {
                     $messenger = new MessengerModule\RocketChat($accessToken, $userId, $serverUrl, $channel);
                     if ($messenger->send($testMsgBody)) {
@@ -2275,8 +2275,8 @@ 
                 $recipients = $_GET['recipients'] ?? '';
 
                 if (
-                    (! filter_var($host, FILTER_VALIDATE_IP) && ! filter_var($host, FILTER_VALIDATE_DOMAIN))
-                    || ! is_numeric($port)
+                    (!filter_var($host, FILTER_VALIDATE_IP) && !filter_var($host, FILTER_VALIDATE_DOMAIN))
+                    || !is_numeric($port)
                     || empty($user)
                     || empty($pass) 
                 ) {
@@ -2289,14 +2289,14 @@ 
                     $host = $type . '://' . $host;
                 }
 
-                if (! empty($sender) && $recipients) {
+                if (!empty($sender) && $recipients) {
                     $recipients = str_replace("\r", '|', $recipients);
                     $recipients = str_replace("\n", '|', $recipients);
                     $recipients = explode('|', $recipients);
 
                     $messenger = new MessengerModule\Smtp($user, $pass, $host, (int) $port);
 
-                    foreach($recipients as $recipient) {
+                    foreach ($recipients as $recipient) {
                         if (filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
                             $messenger->addRecipient($recipient);
                         }
@@ -2318,14 +2318,14 @@ 
                 $sender = $_GET['sender'] ?? '';
                 $recipients = $_GET['recipients'] ?? '';
 
-                if (! empty($sender) && ! empty($recipients)) {
+                if (!empty($sender) && !empty($recipients)) {
                     $recipients = str_replace("\r", '|', $recipients);
                     $recipients = str_replace("\n", '|', $recipients);
                     $recipients = explode('|', $recipients);
 
                     $messenger = new MessengerModule\Mail();
 
-                    foreach($recipients as $recipient) {
+                    foreach ($recipients as $recipient) {
                    
                         if (filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
                             $messenger->addRecipient($recipient);
@@ -2349,14 +2349,14 @@ 
                 $sender = $_GET['sender'] ?? '';
                 $recipients = $_GET['recipients'] ?? '';
 
-                if (! empty($sender) && ! empty($recipients) && ! empty($apiKey)) {
+                if (!empty($sender) && !empty($recipients) && !empty($apiKey)) {
                     $recipients = str_replace("\r", '|', $recipients);
                     $recipients = str_replace("\n", '|', $recipients);
                     $recipients = explode('|', $recipients);
 
                     $messenger = new MessengerModule\Sendgrid($apiKey);
 
-                    foreach($recipients as $recipient) {
+                    foreach ($recipients as $recipient) {
                         if (filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
                             $messenger->addRecipient($recipient);
                         }
@@ -2380,14 +2380,14 @@ 
                 $sender = $_GET['sender'] ?? '';
                 $recipients = $_GET['recipients'] ?? '';
 
-                if (! empty($sender) && ! empty($recipients) && ! empty($apiKey) && ! empty($domain)) {
+                if (!empty($sender) && !empty($recipients) && !empty($apiKey) && !empty($domain)) {
                     $recipients = str_replace("\r", '|', $recipients);
                     $recipients = str_replace("\n", '|', $recipients);
                     $recipients = explode('|', $recipients);
 
                     $messenger = new MessengerModule\Mailgun($apiKey, $domain);
 
-                    foreach($recipients as $recipient) {
+                    foreach ($recipients as $recipient) {
                         if (filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
                             $messenger->addRecipient($recipient);
                         }

Braces +54 added lines, -18 removed lines

@@ -322,8 +322,12 @@ 
                 break;
         }
 
-        if (isset($_GET)) unset($_GET);
-        if (isset($_POST)) unset($_POST);
+        if (isset($_GET)) {
+            unset($_GET);
+        }
+        if (isset($_POST)) {
+            unset($_POST);
+        }
     }
 
     /**
@@ -912,10 +916,18 @@ 
                 $this->setConfig('ip_manager', $ipList);
             }
 
-            if (isset($_POST['url']))    unset($_POST['url']);
-            if (isset($_POST['ip']))     unset($_POST['ip']);
-            if (isset($_POST['action'])) unset($_POST['action']);
-            if (isset($_POST['order']))  unset($_POST['order']);
+            if (isset($_POST['url'])) {
+                unset($_POST['url']);
+            }
+            if (isset($_POST['ip'])) {
+                unset($_POST['ip']);
+            }
+            if (isset($_POST['action'])) {
+                unset($_POST['action']);
+            }
+            if (isset($_POST['order'])) {
+                unset($_POST['order']);
+            }
 
             $this->saveConfig();
         }
@@ -953,9 +965,15 @@ 
 
             $this->setConfig('excluded_urls', $excludedUrls);
 
-            if (isset($_POST['url']))    unset($_POST['url']);
-            if (isset($_POST['action'])) unset($_POST['action']);
-            if (isset($_POST['order']))  unset($_POST['order']);
+            if (isset($_POST['url'])) {
+                unset($_POST['url']);
+            }
+            if (isset($_POST['action'])) {
+                unset($_POST['action']);
+            }
+            if (isset($_POST['order'])) {
+                unset($_POST['order']);
+            }
 
             $this->saveConfig();
         }
@@ -996,11 +1014,21 @@ 
 
             $this->setConfig('www_authenticate', $authenticatedList);
 
-            if (isset($_POST['url']))    unset($_POST['url']);
-            if (isset($_POST['user']))   unset($_POST['user']);
-            if (isset($_POST['pass']))   unset($_POST['pass']);
-            if (isset($_POST['action'])) unset($_POST['action']);
-            if (isset($_POST['order']))  unset($_POST['order']);
+            if (isset($_POST['url'])) {
+                unset($_POST['url']);
+            }
+            if (isset($_POST['user'])) {
+                unset($_POST['user']);
+            }
+            if (isset($_POST['pass'])) {
+                unset($_POST['pass']);
+            }
+            if (isset($_POST['action'])) {
+                unset($_POST['action']);
+            }
+            if (isset($_POST['order'])) {
+                unset($_POST['order']);
+            }
 
             $this->saveConfig();
         }
@@ -1058,10 +1086,18 @@ 
 
             $this->setConfig('xss_protected_list', $xssProtectedList);
 
-            if (isset($_POST['type']))     unset($_POST['type']);
-            if (isset($_POST['variable'])) unset($_POST['variable']);
-            if (isset($_POST['action']))   unset($_POST['action']);
-            if (isset($_POST['order']))    unset($_POST['order']);
+            if (isset($_POST['type'])) {
+                unset($_POST['type']);
+            }
+            if (isset($_POST['variable'])) {
+                unset($_POST['variable']);
+            }
+            if (isset($_POST['action'])) {
+                unset($_POST['action']);
+            }
+            if (isset($_POST['order'])) {
+                unset($_POST['order']);
+            }
 
             $this->saveConfig();
         }

src/Shieldon/Component/Rdns.php

Spacing +3 added lines, -3 removed lines

@@ -45,8 +45,8 @@ 
      */
     public function isDenied(): bool
     {
-        if (! empty($this->deniedList)) {
-            if (preg_match('/(' . implode('|', $this->deniedList). ')/i', $this->ipResolvedHostname)) {
+        if (!empty($this->deniedList)) {
+            if (preg_match('/(' . implode('|', $this->deniedList) . ')/i', $this->ipResolvedHostname)) {
                 return true;
             }
         }
@@ -64,7 +64,7 @@ 
             }
 
             // Not a valid domain name.
-            if (! filter_var($this->ipResolvedHostname, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
+            if (!filter_var($this->ipResolvedHostname, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
                 return true;
             }
 

src/Shieldon/Component/UserAgent.php

Spacing +12 added lines, -12 removed lines

@@ -44,22 +44,22 @@ 
         $this->deniedList = [
 
             // Web information crawlers
-            'domain',         // Block all domain name information crawlers.
-            'copyright',      // Block all copyright information crawlers.
+            'domain', // Block all domain name information crawlers.
+            'copyright', // Block all copyright information crawlers.
 
             // SEO backlink crawlers
-            'Ahrefs',         // http://ahrefs.com/robot/
-            'roger',          // rogerbot (SEOMOZ)
-            'moz.com',        // Block all SEOMOZ crawlers
-            'MJ12bot',        // Majestic crawlers
-            'findlinks',      // http://wortschatz.uni-leipzig.de/findlinks
-            'Semrush',        // http://www.semrush.com/bot.html
+            'Ahrefs', // http://ahrefs.com/robot/
+            'roger', // rogerbot (SEOMOZ)
+            'moz.com', // Block all SEOMOZ crawlers
+            'MJ12bot', // Majestic crawlers
+            'findlinks', // http://wortschatz.uni-leipzig.de/findlinks
+            'Semrush', // http://www.semrush.com/bot.html
 
             // Others
-            'archive',        // Wayback machine
+            'archive', // Wayback machine
         ];
 
-        if (! empty($_SERVER['HTTP_USER_AGENT'])) {
+        if (!empty($_SERVER['HTTP_USER_AGENT'])) {
             $this->userAgentString = $_SERVER['HTTP_USER_AGENT'];
         }
     }
@@ -69,8 +69,8 @@ 
      */
     public function isDenied(): bool
     {
-        if (! empty($this->deniedList)) {
-            if (preg_match('/(' . implode('|', $this->deniedList). ')/i', $this->userAgentString)) {
+        if (!empty($this->deniedList)) {
+            if (preg_match('/(' . implode('|', $this->deniedList) . ')/i', $this->userAgentString)) {
                 return true;
             }
         }