terrylinooo / shieldon

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']++;

src/Firewall/Firewall/SetupTrait.php

Spacing +4 added lines, -4 removed lines

@@ -279,7 +279,7 @@ 
 
         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'];
@@ -352,7 +352,7 @@ 
         $this->kernel->setProperty(
             'deny_attempt_enable',
             [
-                'data_circle'     => $setting['data_circle']['enable'],     // false   
+                'data_circle'     => $setting['data_circle']['enable'], // false   
                 'system_firewall' => $setting['system_firewall']['enable'], // false   
             ]
         );
@@ -360,7 +360,7 @@ 
         $this->kernel->setProperty(
             'deny_attempt_buffer',
             [
-                'data_circle'     => $setting['data_circle']['buffer'],     // 10
+                'data_circle'     => $setting['data_circle']['buffer'], // 10
                 'system_firewall' => $setting['system_firewall']['buffer'], // 10
             ]
         );
@@ -428,7 +428,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart

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/Panel/Report.php

Spacing +4 added lines, -4 removed lines

@@ -197,11 +197,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;