terrylinooo / shieldon

src/Shieldon/Component/Ip.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
             $this->setIp($ip);
         }
 
-        if (! filter_var($this->ip, FILTER_VALIDATE_IP)) {
+        if (!filter_var($this->ip, FILTER_VALIDATE_IP)) {
             return [
                 'status' => 'deny',
                 'code' => self::REASON_INVALID_IP,
@@ -366,7 +366,7 @@ 
      */
     public function setAllowedItem(string $string): void
     {
-        if (! in_array($string, $this->allowedList)) {
+        if (!in_array($string, $this->allowedList)) {
             array_push($this->allowedList, $string);
         }
     }

src/Shieldon/Integration/Bootstrapper.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
             $firewall = new Firewall($storage);
 
-            if (! empty($requestURI) && 0 === strpos($_SERVER['REQUEST_URI'], $requestURI)) {
+            if (!empty($requestURI) && 0 === strpos($_SERVER['REQUEST_URI'], $requestURI)) {
 
                 // Get into the Firewall Panel.
                 $controlPanel = new FirewallPanel($firewall);

src/Shieldon/Firewall.php

Spacing +47 added lines, -47 removed lines

@@ -83,7 +83,7 @@ 
             $this->directory = rtrim($source, '\\/');
             $configFilePath = $this->directory . '/' . $this->filename;
 
-            if (! file_exists($configFilePath)) {
+            if (!file_exists($configFilePath)) {
 
                 $jsonString = file_get_contents(__DIR__ . '/../../config.json');
 
@@ -230,11 +230,11 @@ 
                     $host = '127.0.0.1';
                     $port = 6379;
 
-                    if (! empty($redisSetting['host'])) {
+                    if (!empty($redisSetting['host'])) {
                         $host = $redisSetting['host'];
                     }
 
-                    if (! empty($redisSetting['port'])) {
+                    if (!empty($redisSetting['port'])) {
                         $port = $redisSetting['port'];
                     }
 
@@ -242,7 +242,7 @@ 
                     $redis = new Redis();
                     $redis->connect($host, $port);
 
-                    if (! empty($redisSetting['auth'])) {
+                    if (!empty($redisSetting['auth'])) {
 
                         // @codeCoverageIgnoreStart
                         $redis->auth($redisSetting['auth']);
@@ -253,7 +253,7 @@ 
                     $this->shieldon->setDriver(new RedisDriver($redis));
 
                 // @codeCoverageIgnoreStart
-                } catch(RedisException $e) {
+                } catch (RedisException $e) {
                     $this->status = false;
 
                     echo $e->getMessage();
@@ -296,7 +296,7 @@ 
                     $this->shieldon->setDriver(new SqliteDriver($pdoInstance));
     
                 // @codeCoverageIgnoreStart
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                     $this->status = false;
 
                     echo $e->getMessage();
@@ -315,7 +315,7 @@ 
                     // Create a PDO instance.
                     $pdoInstance = new PDO(
                         'mysql:host=' 
-                            . $mysqlSetting['host']   . ';dbname=' 
+                            . $mysqlSetting['host'] . ';dbname=' 
                             . $mysqlSetting['dbname'] . ';charset=' 
                             . $mysqlSetting['charset']
                         , (string) $mysqlSetting['user']
@@ -326,7 +326,7 @@ 
                     $this->shieldon->setDriver(new MysqlDriver($pdoInstance));
 
                 // @codeCoverageIgnoreStart
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                     echo $e->getMessage();
                 }
                 // @codeCoverageIgnoreEnd
@@ -344,7 +344,7 @@ 
         $loggerSetting = $this->getOption('action', 'loggers');
 
         if ($loggerSetting['enable']) {
-            if (! empty($loggerSetting['config']['directory_path'])) {
+            if (!empty($loggerSetting['config']['directory_path'])) {
                 $this->shieldon->setLogger(new ActionLogger($loggerSetting['config']['directory_path']));
             }
         }
@@ -574,8 +574,8 @@ 
 
         $messageTitle = 'Firewall Notification';
 
-        if (! empty($telegramSetting['enable'])) {
-            if (! empty($telegramSetting['confirm_test'])) {
+        if (!empty($telegramSetting['enable'])) {
+            if (!empty($telegramSetting['confirm_test'])) {
                 $apiKey = $telegramSetting['config']['api_key'] ?? '';
                 $channel = $telegramSetting['config']['channel'] ?? '';
                 $this->shieldon->setMessenger(
@@ -584,8 +584,8 @@ 
             }
         }
 
-        if (! empty($linenotodySetting['enable'])) {
-            if (! empty($linenotodySetting['confirm_test'])) {
+        if (!empty($linenotodySetting['enable'])) {
+            if (!empty($linenotodySetting['confirm_test'])) {
                 $accessToken = $linenotodySetting['config']['access_token'] ?? '';
                 $this->shieldon->setMessenger(
                     new MessengerModule\LineNotify($accessToken)
@@ -593,8 +593,8 @@ 
             }
         }
 
-        if (! empty($sendgridSetting['enable'])) {
-            if (! empty($sendgridSetting['confirm_test'])) {
+        if (!empty($sendgridSetting['enable'])) {
+            if (!empty($sendgridSetting['confirm_test'])) {
                 $apiKey = $sendgridSetting['config']['api_key'] ?? '';
                 $sender = $sendgridSetting['config']['sender'] ?? '';
                 $recipients = $sendgridSetting['config']['recipients'] ?? [];
@@ -611,8 +611,8 @@ 
             }
         }
 
-        if (! empty($phpMailSetting['enable'])) {
-            if (! empty($phpMailSetting['confirm_test'])) {
+        if (!empty($phpMailSetting['enable'])) {
+            if (!empty($phpMailSetting['confirm_test'])) {
                 $sender = $phpMailSetting['config']['sender'] ?? '';
                 $recipients = $phpMailSetting['config']['recipients'] ?? [];
 
@@ -628,8 +628,8 @@ 
             }
         }
 
-        if (! empty($smtpSetting['enable'])) {
-            if (! empty($smtpSetting['confirm_test'])) {
+        if (!empty($smtpSetting['enable'])) {
+            if (!empty($smtpSetting['confirm_test'])) {
                 $sender = $smtpSetting['config']['sender'] ?? '';
                 $recipients = $smtpSetting['config']['recipients'] ?? [];
                 $host = $smtpSetting['config']['host'] ?? '';
@@ -649,8 +649,8 @@ 
             }
         }
 
-        if (! empty($mailgunSetting['enable'])) {
-            if (! empty($mailgunSetting['confirm_test'])) {
+        if (!empty($mailgunSetting['enable'])) {
+            if (!empty($mailgunSetting['confirm_test'])) {
                 $apiKey = $mailgunSetting['config']['api_key'] ?? '';
                 $domain = $mailgunSetting['config']['domain_name'] ?? '';
                 $sender = $mailgunSetting['config']['sender'] ?? '';
@@ -668,8 +668,8 @@ 
             }
         }
 
-        if (! empty($rocketchatSetting['enable'])) {
-            if (! empty($rocketchatSetting['confirm_test'])) {
+        if (!empty($rocketchatSetting['enable'])) {
+            if (!empty($rocketchatSetting['confirm_test'])) {
                 $serverUrl = $rocketchatSetting['config']['server_url'] ?? '';
                 $userId = $rocketchatSetting['config']['user_id'] ?? '';
                 $accessToken = $rocketchatSetting['config']['access_token'] ?? '';
@@ -683,8 +683,8 @@ 
             }
         }
 
-        if (! empty($slackSetting['enable'])) {
-            if (! empty($slackSetting['confirm_test'])) {
+        if (!empty($slackSetting['enable'])) {
+            if (!empty($slackSetting['confirm_test'])) {
                 $botToken = $slackSetting['config']['bot_token'] ?? '';
                 $channel = $slackSetting['config']['channel'] ?? '';
 
@@ -694,8 +694,8 @@ 
             }
         }
 
-        if (! empty($slackWebhookSetting['enable'])) {
-            if (! empty($slackWebhookSetting['confirm_test'])) {
+        if (!empty($slackWebhookSetting['enable'])) {
+            if (!empty($slackWebhookSetting['confirm_test'])) {
                 $webhookUrl = $slackWebhookSetting['config']['webhook_url'] ?? '';
 
                 $this->shieldon->setMessenger(
@@ -779,7 +779,7 @@ 
     protected function setIptablesWatchingFolder(): void
     {
         $iptablesSetting = $this->getOption('config', 'iptables');
-        $this->shieldon->setProperty('iptables_watching_folder',  $iptablesSetting['watching_folder']);
+        $this->shieldon->setProperty('iptables_watching_folder', $iptablesSetting['watching_folder']);
     }
 
     /**
@@ -816,7 +816,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (! empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart
@@ -847,7 +847,7 @@ 
     {
         $excludedUrls = $this->getOption('excluded_urls');
 
-        if (! empty($excludedUrls)) {
+        if (!empty($excludedUrls)) {
             $list = array_column($excludedUrls, 'url');
 
             $this->shieldon->setExcludedUrls($list);
@@ -867,7 +867,7 @@ 
 
         if ($xssProtectionOptions['post']) {
             $this->shieldon->setClosure('xss_post', function() use ($xssFilter) {
-                if (! empty($_POST)) {
+                if (!empty($_POST)) {
                     foreach (array_keys($_POST) as $k) {
                         $_POST[$k] = $xssFilter->clean($_POST[$k]);
                     }
@@ -877,7 +877,7 @@ 
 
         if ($xssProtectionOptions['get']) {
             $this->shieldon->setClosure('xss_get', function() use ($xssFilter) {
-                if (! empty($_GET)) {
+                if (!empty($_GET)) {
                     foreach (array_keys($_GET) as $k) {
                         $_GET[$k] = $xssFilter->clean($_GET[$k]);
                     }
@@ -887,7 +887,7 @@ 
 
         if ($xssProtectionOptions['cookie']) {
             $this->shieldon->setClosure('xss_cookie', function() use ($xssFilter) {
-                if (! empty($_COOKIE)) {
+                if (!empty($_COOKIE)) {
                     foreach (array_keys($_COOKIE) as $k) {
                         $_COOKIE[$k] = $xssFilter->clean($_COOKIE[$k]);
                     }
@@ -897,7 +897,7 @@ 
 
         $xssProtectedList = $this->getOption('xss_protected_list');
 
-        if (! empty($xssProtectedList)) {
+        if (!empty($xssProtectedList)) {
         
             $this->shieldon->setClosure('xss_protection', function() use ($xssFilter, $xssProtectedList) {
 
@@ -908,21 +908,21 @@ 
 
                         case 'get':
 
-                            if (! empty($_GET[$k])) {
+                            if (!empty($_GET[$k])) {
                                 $_GET[$k] = $xssFilter->clean($_GET[$k]);
                             }
                             break;
     
                         case 'post':
     
-                            if (! empty($_POST[$k])) {
+                            if (!empty($_POST[$k])) {
                                 $_POST[$k] = $xssFilter->clean($_POST[$k]);
                             }
                             break;
     
                         case 'cookie':
 
-                            if (! empty($_COOKIE[$k])) {
+                            if (!empty($_COOKIE[$k])) {
                                 $_COOKIE[$k] = $xssFilter->clean($_COOKIE[$k]);
                             }
                             break;
@@ -943,7 +943,7 @@ 
     {
         $authenticateList = $this->getOption('www_authenticate');
 
-        if (! empty($authenticateList)) {
+        if (!empty($authenticateList)) {
 
             $authHandler = new httpAuthentication();
 
@@ -964,10 +964,10 @@ 
         $allowedList = [];
         $deniedList = [];
 
-        if (! empty($ipList)) {
+        if (!empty($ipList)) {
             foreach ($ipList as $ip) {
 
-                if (0 === strpos($this->shieldon->getCurrentUrl(), $ip['url']) ) {
+                if (0 === strpos($this->shieldon->getCurrentUrl(), $ip['url'])) {
     
                     if ('allow' === $ip['rule']) {
                         $allowedList[] = $ip['ip'];
@@ -980,11 +980,11 @@ 
             }
         }
 
-        if (! empty($allowedList)) {
+        if (!empty($allowedList)) {
             $this->shieldon->component['Ip']->setAllowedList($allowedList);
         }
 
-        if (! empty($deniedList)) {
+        if (!empty($deniedList)) {
             $this->shieldon->component['Ip']->setDeniedList($deniedList);
         }
     }
@@ -998,7 +998,7 @@ 
     {
         $ui = $this->getOption('dialog_ui');
 
-        if (! empty($ui)) {
+        if (!empty($ui)) {
             $_SESSION['SHIELDON_UI_LANG'] = $ui['lang'];
             $this->shieldon->setDialogUI($this->getOption('dialog_ui'));
         }
@@ -1017,11 +1017,11 @@ 
      */
     private function getOption(string $option, string $section = '')
     {
-        if (! empty($this->configuration[$section][$option])) {
+        if (!empty($this->configuration[$section][$option])) {
             return $this->configuration[$section][$option];
         }
 
-        if (! empty($this->configuration[$option]) && $section === '') {
+        if (!empty($this->configuration[$option]) && $section === '') {
             return $this->configuration[$option];
         }
 
@@ -1037,8 +1037,8 @@ 
     {
         $configFilePath = $this->directory . '/' . $this->filename;
 
-        if (! file_exists($configFilePath)) {
-            if (! is_dir($this->directory)) {
+        if (!file_exists($configFilePath)) {
+            if (!is_dir($this->directory)) {
                 // @codeCoverageIgnoreStart
                 $originalUmask = umask(0);
                 @mkdir($this->directory, 0777, true);

templates/panel/action_log_last_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

templates/panel/action_log_this_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

templates/panel/action_log_yesterday.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }