terrylinooo / shieldon

src/Firewall/Panel/Home.php

Spacing +4 added lines, -4 removed lines

@@ -236,11 +236,11 @@
     private function overviewTemplateVarsOfComponents(array $data = []): array
     {
         $data['components'] = [
-            'Ip'         => (!empty($this->kernel->component['Ip']))         ? true : false,
+            'Ip'         => (!empty($this->kernel->component['Ip'])) ? true : false,
             'TrustedBot' => (!empty($this->kernel->component['TrustedBot'])) ? true : false,
-            'Header'     => (!empty($this->kernel->component['Header']))     ? true : false,
-            'Rdns'       => (!empty($this->kernel->component['Rdns']))       ? true : false,
-            'UserAgent'  => (!empty($this->kernel->component['UserAgent']))  ? true : false,
+            'Header'     => (!empty($this->kernel->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->kernel->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->kernel->component['UserAgent'])) ? true : false,
         ];
 
         return $data;

src/Firewall/Panel/Report.php

Spacing +6 added lines, -6 removed lines

@@ -127,7 +127,7 @@ 
                 $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'];
                 }
@@ -141,7 +141,7 @@ 
 
                 $logCacheHandler->save($type, $data);
     
-                if ('today' === $type ) {
+                if ('today' === $type) {
                     $this->parser->prepare('past_seven_hours');
                     $data['past_seven_hours'] = $this->parser->getParsedPeriodData();
 
@@ -172,11 +172,11 @@ 
     private function operationTemplateVarsOfComponents(array $data = []): array
     {
         $data['components'] = [
-            'Ip'         => (!empty($this->kernel->component['Ip']))         ? true : false,
+            'Ip'         => (!empty($this->kernel->component['Ip'])) ? true : false,
             'TrustedBot' => (!empty($this->kernel->component['TrustedBot'])) ? true : false,
-            'Header'     => (!empty($this->kernel->component['Header']))     ? true : false,
-            'Rdns'       => (!empty($this->kernel->component['Rdns']))       ? true : false,
-            'UserAgent'  => (!empty($this->kernel->component['UserAgent']))  ? true : false,
+            'Header'     => (!empty($this->kernel->component['Header'])) ? true : false,
+            'Rdns'       => (!empty($this->kernel->component['Rdns'])) ? true : false,
+            'UserAgent'  => (!empty($this->kernel->component['UserAgent'])) ? true : false,
         ];
 
         return $data;

templates/panel/setting/daemon.php

Braces +5 added lines, -2 removed lines

@@ -304,9 +304,12 @@
                 <div>
                     <?php if ($this->mode === 'demo') : ?>
                         <code id="code1" style="display: none">* * * * * root bash your_project_folder/vendor/shieldon/bin/iptables_bridge.sh --watch=your_watching_folder >> /var/log/shieldon.log 2>&1</code>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <code id="code1" style="display: none">* * * * * root bash <?php echo realpath(__DIR__ . '/../../../bin/iptables_bridge.sh') ?> --watch=<span id="iptables-watch-folder"></span> >> /var/log/shieldon.log 2>&1</code>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     
                     <textarea id="code2" class="form-control" rows="4" style="font-size: 12px; font-family: monospace;"></textarea>
                 </div><br />

templates/panel/table_sessions.php

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
             </div>
             <div class="board-field right">
                 <div class="heading"><?php _e('panel', 'table_heading_period', 'Period'); ?></div>
-                <div class="nums"><?php echo number_format($session_limit_period ); ?></div>
+                <div class="nums"><?php echo number_format($session_limit_period); ?></div>
                 <div class="note"><?php _e('panel', 'table_note_period', 'Keep-alive period. (minutes)'); ?></div>
             </div>
         </div>
@@ -49,7 +49,7 @@ 
             </div>
             <div class="board-field right">
                 <div class="heading"><?php _e('panel', 'table_heading_online', 'Online'); ?></div>
-                <div class="nums"><?php echo number_format($online_count ); ?></div>
+                <div class="nums"><?php echo number_format($online_count); ?></div>
                 <div class="note"><?php _e('panel', 'table_note_online', 'Online session amount.'); ?></div>
             </div>
         </div>
@@ -89,14 +89,14 @@ 
 
                         $remainsTime = $expires - (time() - $sessionInfo['time']);
 
-                        if ($remainsTime < 1 ) {
+                        if ($remainsTime < 1) {
                             $remainsTime = 0;
                         }
 
-                        if ($i < $session_limit_count ) {
+                        if ($i < $session_limit_count) {
                             $satusName = __('panel', 'table_text_allowable', 'Allowable');
 
-                            if ($remainsTime < 1 ) {
+                            if ($remainsTime < 1) {
                                 $satusName = __('panel', 'table_text_expired', 'Expired');
                             }
                         } else {

templates/panel/table_filter_logs.php

Spacing +4 added lines, -4 removed lines

@@ -58,20 +58,20 @@
             </thead>
             <tbody>
                 <?php foreach ($ip_log_list as $ipInfo) : ?>
-                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true ); ?>
+                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true); ?>
                     <?php
 
                         $text_warning = '';
 
-                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100 ) {
+                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2 ) {
+                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3 ) {
+                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3) {
                             $text_warning = '<span class="so-text-danger"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
                     ?>

src/Firewall/Firewall/Messenger/ItemSlack.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     public static function get(array $setting): MessengerInterface
     {
         $botToken = $setting['config']['bot_token'] ?? '';
-        $channel  = $setting['config']['channel']   ?? '';
+        $channel  = $setting['config']['channel'] ?? '';
 
         return new Slack($botToken, $channel);
     }

src/Firewall/Firewall/Messenger/ItemMailgun.php

Spacing +3 added lines, -3 removed lines

@@ -30,10 +30,10 @@
      */
     public static function get(array $setting): MessengerInterface
     {
-        $apiKey     = $setting['config']['api_key']     ?? '';
+        $apiKey     = $setting['config']['api_key'] ?? '';
         $domain     = $setting['config']['domain_name'] ?? '';
-        $sender     = $setting['config']['sender']      ?? '';
-        $recipients = $setting['config']['recipients']  ?? [];
+        $sender     = $setting['config']['sender'] ?? '';
+        $recipients = $setting['config']['recipients'] ?? [];
 
         $instance = new Mailgun($apiKey, $domain);
         $instance->setSubject(__('core', 'messenger_text_mail_subject'));

src/Firewall/Firewall/Messenger/ItemRocketChat.php

Spacing +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@
      */
     public static function get(array $setting): MessengerInterface
     {
-        $serverUrl   = $setting['config']['server_url']   ?? '';
-        $userId      = $setting['config']['user_id']      ?? '';
+        $serverUrl   = $setting['config']['server_url'] ?? '';
+        $userId      = $setting['config']['user_id'] ?? '';
         $accessToken = $setting['config']['access_token'] ?? '';
-        $channel     = $setting['config']['channel']      ?? '';
+        $channel     = $setting['config']['channel'] ?? '';
 
         return new RocketChat($accessToken, $userId, $serverUrl, $channel);
     }

src/Firewall/Kernel.php

Spacing +3 added lines, -3 removed lines

@@ -614,9 +614,9 @@
         $this->initComponents();
 
         $processMethods = [
-            'isRuleExist',   // Stage 1 - Looking for rule table.
-            'isTrustedBot',  // Stage 2 - Detect popular search engine.
-            'isFakeRobot',   // Stage 3 - Reject fake search engine crawlers.
+            'isRuleExist', // Stage 1 - Looking for rule table.
+            'isTrustedBot', // Stage 2 - Detect popular search engine.
+            'isFakeRobot', // Stage 3 - Reject fake search engine crawlers.
             'isIpComponent', // Stage 4 - IP manager.
             'isComponents'   // Stage 5 - Check other components.
         ];