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/FirewallTrait.php

Spacing +1 added lines, -1 removed lines

@@ -243,7 +243,7 @@
     {
         $driverType = (string) $this->getOption('driver_type');
 
-        return $this->directory . '/' . $this->channel .  '_' . $driverType . '_' . $this->checkpoint;
+        return $this->directory . '/' . $this->channel . '_' . $driverType . '_' . $this->checkpoint;
     }
 
     /**

src/Firewall/Helpers.php

Spacing +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
         $masked = implode('.', $tmp);
 
     } else {
-        $masked =  str_repeat('*', strlen($str) - 6) . substr($str, -6);
+        $masked = str_repeat('*', strlen($str) - 6) . substr($str, -6);
     }
 
     return $masked;

src/Firewall/Log/ActionLogger.php

Spacing +3 added lines, -3 removed lines

@@ -112,10 +112,10 @@
 
         $data = [];
 
-        $data[0] = $record['ip']          ?? 'null';
-        $data[1] = $record['session_id']  ?? 'null';
+        $data[0] = $record['ip'] ?? 'null';
+        $data[1] = $record['session_id'] ?? 'null';
         $data[2] = $record['action_code'] ?? 'null';
-        $data[3] = $record['timesamp']    ?? 'null';
+        $data[3] = $record['timesamp'] ?? 'null';
 
         file_put_contents($this->filePath, implode(',', $data) . "\n", FILE_APPEND | LOCK_EX);
     }

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];
     }

src/Firewall/Log/ActionLogParser.php

Spacing +28 added lines, -28 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');
@@ -348,21 +348,21 @@ 
 
         $results = [];
 
-        $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_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['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();
 
@@ -405,22 +405,22 @@ 
 
         $results = [];
 
-        $results['captcha_chart_string']  = '';     // string
-        $results['pageview_chart_string'] = '';     // string
-        $results['label_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_chart_string']  = ''; // string
+        $results['pageview_chart_string'] = ''; // string
+        $results['label_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['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)) {
 
@@ -450,7 +450,7 @@ 
             }
 
             $results['captcha_chart_string'] = implode(',', $chartCaptcha);
-            $results['pageview_chart_string']= implode(',', $chartPageview);
+            $results['pageview_chart_string'] = implode(',', $chartPageview);
             $results['captcha_success_chart_string'] = implode(',', $chartCaptchaSuccess);
             $results['captcha_failure_chart_string'] = implode(',', $chartCaptchaFailure);
             $results['label_chart_string'] = "'" . implode("','", $labels) . "'";
@@ -480,7 +480,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']++;

templates/panel/template.php

Spacing +1 added lines, -1 removed lines

@@ -246,7 +246,7 @@
                 </div>
             </div>
         </div>
-        <?php if (! empty($this->messages)) : ?>
+        <?php if (!empty($this->messages)) : ?>
         <div id="message-modal" class="modal fade" tabindex="-1" role="dialog">
             <div class="modal-dialog modal-dialog-centered modal-lightbox" role="document">
                 <div class="modal-content">

Braces +5 added lines, -2 removed lines

@@ -263,13 +263,16 @@
                                         <?php endif; ?>
                                      </span>
                                 </div>
-                            <?php else: ?>
+                            <?php else {
+    : ?>
                                 <div class="icon-box">
                                     <span class="message-icon">
                                         <i class="fas fa-exclamation-circle"></i>
                                     </span>
                                 </div>
-                            <?php endif; ?>
+                            <?php endif;
+}
+?>
                         </div>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>