terrylinooo / shieldon

src/Firewall/Firewall/MainTrait.php

Spacing +7 added lines, -7 removed lines

@@ -102,7 +102,7 @@ 
 
         $frequencyQuota = [];
         foreach ($frequencyDefaults as $k => $quota) {
-            $i = 'quota_' .  $k;
+            $i = 'quota_' . $k;
             $frequencyQuota[$k] = $settings['frequency']['config'][$i] ?? $quota;
         }
 
@@ -235,7 +235,7 @@ 
         if (is_array($ipList)) {
             foreach ($ipList as $ip) {
 
-                if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url']) ) {
+                if (0 === strpos($this->kernel->getCurrentUrl(), $ip['url'])) {
     
                     if ('allow' === $ip['rule']) {
                         $allowedList[] = $ip['ip'];
@@ -304,7 +304,7 @@ 
     {
         $setting = $this->getOption('failed_attempts_in_a_row', 'events');
 
-        $enableDataCircle     = $setting['data_circle']['enable']     ?: false;
+        $enableDataCircle     = $setting['data_circle']['enable'] ?: false;
         $enableSystemFirewall = $setting['system_firewall']['enable'] ?: false;
 
         $this->kernel->setProperty('deny_attempt_enable', [
@@ -321,7 +321,7 @@ 
         $recordAttempt = $this->getOption('record_attempt');
 
         $detectionPeriod = $recordAttempt['detection_period'] ?? 5;
-        $timeToReset     = $recordAttempt['time_to_reset']    ?? 1800;
+        $timeToReset     = $recordAttempt['time_to_reset'] ?? 1800;
 
         $this->kernel->setProperty('record_attempt_detection_period', $detectionPeriod);
         $this->kernel->setProperty('reset_attempt_counter', $timeToReset);
@@ -335,7 +335,7 @@ 
     protected function setIptablesBridgeDirectory(): void
     {
         $iptablesSetting = $this->getOption('config', 'iptables');
-        $this->kernel->setProperty('iptables_watching_folder',  $iptablesSetting['watching_folder']);
+        $this->kernel->setProperty('iptables_watching_folder', $iptablesSetting['watching_folder']);
     }
 
     /**
@@ -349,7 +349,7 @@ 
 
         if ($sessionLimitSetting['enable']) {
 
-            $onlineUsers = $sessionLimitSetting['config']['count']  ?? 100;
+            $onlineUsers = $sessionLimitSetting['config']['count'] ?? 100;
             $alivePeriod = $sessionLimitSetting['config']['period'] ?? 300;
 
             $this->kernel->limitSession($onlineUsers, $alivePeriod);
@@ -376,7 +376,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart

src/Firewall/Log/ActionLogParser.php

Spacing +28 added lines, -28 removed lines

@@ -197,7 +197,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');
@@ -336,21 +336,21 @@ 
             return [];
         }
 
-        $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();
 
@@ -391,22 +391,22 @@ 
     {
         $periodData = $this->getPeriodData();
 
-        $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)) {
 
@@ -436,7 +436,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) . "'";
@@ -466,7 +466,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']++;