terrylinooo / shieldon

src/Firewall/Driver/RedisDriver.php

Spacing +2 added lines, -2 removed lines

@@ -274,8 +274,8 @@
     {
         $table = [
             'filter'  => $this->tableFilterLogs . ':' . $ip,
-            'session' => $this->tableSessions   . ':' . $ip,
-            'rule'    => $this->tableRuleList   . ':' . $ip,
+            'session' => $this->tableSessions . ':' . $ip,
+            'rule'    => $this->tableRuleList . ':' . $ip,
         ];
         
         return $table[$type] ?? '';

src/Firewall/Driver/FileDriverTrait.php

Spacing +2 added lines, -2 removed lines

@@ -100,8 +100,8 @@
         $path = [];
 
         $path['filter']  = $this->directory . '/' . $this->tableFilterLogs . '/' . $ip . '.' . $this->extension;
-        $path['session'] = $this->directory . '/' . $this->tableSessions   . '/' . $ip . '.' . $this->extension;
-        $path['rule']    = $this->directory . '/' . $this->tableRuleList   . '/' . $ip . '.' . $this->extension;
+        $path['session'] = $this->directory . '/' . $this->tableSessions . '/' . $ip . '.' . $this->extension;
+        $path['rule']    = $this->directory . '/' . $this->tableRuleList . '/' . $ip . '.' . $this->extension;
 
         return $path[$type] ?? '';
     }

src/Firewall/Firewall/Captcha/ItemImage.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public static function get(array $setting): CaptchaInterface
     {
-        $type   = $setting['config']['type']   ?? 'alnum';
+        $type   = $setting['config']['type'] ?? 'alnum';
         $length = $setting['config']['length'] ?? 8;
 
         $imageCaptchaConfig = [];

src/Firewall/Panel/BaseController.php

Spacing +3 added lines, -5 removed lines

@@ -164,7 +164,7 @@ 
             define('SHIELDON_VIEW', true);
         }
 
-        $viewFilePath =  __DIR__ . '/../../../templates/' . $page . '.php';
+        $viewFilePath = __DIR__ . '/../../../templates/' . $page . '.php';
     
         if (!empty($data)) {
             extract($data);
@@ -433,12 +433,10 @@ 
         $echo = [];
 
         $echo['css'] = $this->getConfig('messengers.' . $moduleName . '.confirm_test') ? 
-            'success' :
-            '';
+            'success' : '';
         
         $echo['icon'] = $this->getConfig('messengers.' . $moduleName . '.confirm_test') ?
-            '<i class="fas fa-check"></i>' :
-            '<i class="fas fa-exclamation"></i>';
+            '<i class="fas fa-check"></i>' : '<i class="fas fa-exclamation"></i>';
 
         echo $echo[$echoType];
     }

templates/panel/iptables_manager.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
                     <select name="subnet" class="regular" id="subnet">
                         <option value="null">---</option>
                         <?php for ($i = 32; $i > 0; $i--) : ?>
-                            <?php $label = $i;  ?>
+                            <?php $label = $i; ?>
                             <?php if ($i === 8) $label = $i . ' (A)'; ?>
                             <?php if ($i === 16) $label = $i . ' (B)'; ?>
                             <?php if ($i === 24) $label = $i . ' (C)'; ?>
@@ -71,7 +71,7 @@ 
                     <select name="subnet" class="regular" id="subnet">
                         <option value="null">---</option>
                         <?php for ($i = 128; $i > 0; $i--) : ?>
-                            <?php $label = $i;  ?>
+                            <?php $label = $i; ?>
                             <option value="<?php echo $i; ?>"><?php echo $label; ?></option>
                         <?php endfor; ?>
                     </select>

templates/panel/xss_protection.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
         </div>
     </div>
     <br />
-    <?php if ( empty($xss_protected_list)) : ?>
+    <?php if (empty($xss_protected_list)) : ?>
     <div id="so-table-container" class="so-datatables">
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
             <tbody>

templates/panel/ip_manager.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
         </div>
     </div>
     <br />
-    <?php if ( empty($ip_list)) : ?>
+    <?php if (empty($ip_list)) : ?>
     <div id="so-table-container" class="so-datatables">
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
             <tbody>

src/Firewall/Log/ActionLogParser.php

Spacing +26 added lines, -26 removed lines

@@ -207,7 +207,7 @@ 
         ];
 
         if (empty($dataRange[$this->type])) {
-            if (preg_match('/past_([0-9]+)_days/', $this->type, $matches) ) {
+            if (preg_match('/past_([0-9]+)_days/', $this->type, $matches)) {
                 $dayCount = $matches[1];
                 $startDate = date('Ymd', strtotime('-' . $dayCount . ' days'));
                 $endDate = date('Ymd');
@@ -350,18 +350,18 @@ 
 
         $results['captcha_chart_string']       = ''; // string
         $results['pageview_chart_string']      = ''; // string
-        $results['captcha_success_count']      = 0;  // integer
-        $results['captcha_failure_count']      = 0;  // integer
-        $results['captcha_count']              = 0;  // integer
-        $results['pageview_count']             = 0;  // integer
-        $results['captcha_percentageage']      = 0;  // integer
-        $results['captcha_failure_percentage'] = 0;  // integer
-        $results['captcha_success_percentage'] = 0;  // integer
-        $results['action_ban_count']           = 0;  // integer
-        $results['action_temp_ban_count']      = 0;  // integer
-        $results['action_unban_count']         = 0;  // integer
-        $results['blacklist_count']            = 0;  // integer
-        $results['session_limit_count']        = 0;  // integer
+        $results['captcha_success_count']      = 0; // integer
+        $results['captcha_failure_count']      = 0; // integer
+        $results['captcha_count']              = 0; // integer
+        $results['pageview_count']             = 0; // integer
+        $results['captcha_percentageage']      = 0; // integer
+        $results['captcha_failure_percentage'] = 0; // integer
+        $results['captcha_success_percentage'] = 0; // integer
+        $results['action_ban_count']           = 0; // integer
+        $results['action_temp_ban_count']      = 0; // integer
+        $results['action_unban_count']         = 0; // integer
+        $results['blacklist_count']            = 0; // integer
+        $results['session_limit_count']        = 0; // integer
 
         $ipdData = $this->getIpData();
 
@@ -406,18 +406,18 @@ 
         $results['label_chart_string']         = ''; // string
         $results['captcha_chart_string']       = ''; // string
         $results['pageview_chart_string']      = ''; // string
-        $results['captcha_success_count']      = 0;  // integer
-        $results['captcha_failure_count']      = 0;  // integer
-        $results['captcha_count']              = 0;  // integer
-        $results['pageview_count']             = 0;  // integer
-        $results['captcha_percentageage']      = 0;  // integer
-        $results['captcha_failure_percentage'] = 0;  // integer
-        $results['captcha_success_percentage'] = 0;  // integer
-        $results['action_ban_count']           = 0;  // integer
-        $results['action_temp_ban_count']      = 0;  // integer
-        $results['action_unban_count']         = 0;  // integer
-        $results['blacklist_count']            = 0;  // integer
-        $results['session_limit_count']        = 0;  // integer
+        $results['captcha_success_count']      = 0; // integer
+        $results['captcha_failure_count']      = 0; // integer
+        $results['captcha_count']              = 0; // integer
+        $results['pageview_count']             = 0; // integer
+        $results['captcha_percentageage']      = 0; // integer
+        $results['captcha_failure_percentage'] = 0; // integer
+        $results['captcha_success_percentage'] = 0; // integer
+        $results['action_ban_count']           = 0; // integer
+        $results['action_temp_ban_count']      = 0; // integer
+        $results['action_unban_count']         = 0; // integer
+        $results['blacklist_count']            = 0; // integer
+        $results['session_limit_count']        = 0; // integer
 
         if (!empty($periodData)) {
 
@@ -477,7 +477,7 @@ 
         $ip = $log['ip'];
         $sessionId = $log['session_id'];
 
-        $this->ipDetail[$t][$ip]['session_id'][$sessionId ] = 1;
+        $this->ipDetail[$t][$ip]['session_id'][$sessionId] = 1;
 
         if ($logActionCode === self::LOG_TEMPORARILY_BAN) {
             $this->periodDetail[$t][$k]['action_temp_ban_count']++;

src/Firewall/Panel/Report.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
             $data = array_merge($data, $result);
         }
 
-        $data['page_availability'] = $this->pageAvailability['logs'];;
+        $data['page_availability'] = $this->pageAvailability['logs']; ;
 
         $data['page_url'] = $this->url('report/actionLog');
 
@@ -209,11 +209,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;