terrylinooo / shieldon

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

templates/panel/template.php

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>

templates/panel/table_rules.php

Braces +5 added lines, -2 removed lines

@@ -67,7 +67,8 @@ 
             </tbdoy>
         </table>
     </div>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <div id="so-table-loading" class="so-datatables">
         <div class="lds-css ng-scope">
             <div class="lds-ripple">
@@ -76,7 +77,9 @@ 
             </div>
         </div>
     </div>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     <?php if (!empty($rule_list)) : ?>
     <div id="so-table-container" class="so-datatables" style="display: none;">
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">

templates/panel/operation_status.php

Braces +45 added lines, -18 removed lines

@@ -42,8 +42,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_cookie)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_cookie; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_cookie; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_cookie;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_cookie', 'Check whether visitors can create cookie by JavaScript.'); ?></div>
@@ -58,8 +61,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_session)) : ?>
                             <a href="#" onclick="displayLogs('session');"><?php echo $filter_session; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_session; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_session;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_session', 'Detect whether multiple sessions created by the same visitor.'); ?></div>
@@ -74,8 +80,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_frequency)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_frequency; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_frequency; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_frequency;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_frequency', 'Check how often does a visitor view the pages.'); ?></div>
@@ -90,8 +99,11 @@ 
                     <div class="nums">
                         <?php if (!empty($filter_referer)) : ?>
                             <a href="#" onclick="displayLogs('referer');"><?php echo $filter_referer; ?></a>
-                        <?php else : ?>
-                            <?php echo $filter_referer; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $filter_referer;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_referer', 'Check HTTP referrer information.'); ?></div>
@@ -116,8 +128,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_ip)) : ?>
                             <a href="#" onclick="displayLogs('ip');"><?php echo $component_ip; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_ip; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_ip;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_ip', 'Advanced IP address mangement.'); ?></div>
@@ -132,8 +147,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_trustedbot)) : ?>
                             <a href="#" onclick="displayLogs('trustedbot');"><?php echo $component_trustedbot; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_trustedbot; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_trustedbot;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_trustedbot', 'Allow popular search engines crawl your website.'); ?></div>
@@ -148,8 +166,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_header)) : ?>
                             <a href="#" onclick="displayLogs('header');"><?php echo $component_header; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_header; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_header;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_header', 'Analyze header information from visitors.'); ?></div>
@@ -164,8 +185,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_rdns)) : ?>
                             <a href="#" onclick="displayLogs('rdns');"><?php echo $component_rdns; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_rdns; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_rdns;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_rdns', 'Identify IP resolved hostname (RDNS) from visitors.'); ?></div>
@@ -180,8 +204,11 @@ 
                     <div class="nums">
                         <?php if (!empty($component_useragent)) : ?>
                             <a href="#" onclick="displayLogs('useragent');"><?php echo $component_useragent; ?></a>
-                        <?php else : ?>
-                            <?php echo $component_useragent; ?>
+                        <?php else {
+    : ?>
+                            <?php echo $component_useragent;
+}
+?>
                         <?php endif; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'operation_note_useragent', 'Analysis user-agent information from visitors.'); ?></div>

src/Firewall/Firewall/SetupTrait.php

Spacing +6 added lines, -6 removed lines

@@ -314,7 +314,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'];
@@ -376,7 +376,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   
             ]
         );
@@ -384,7 +384,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
             ]
         );
@@ -429,8 +429,8 @@ 
 
         if ($sessionLimitSetting['enable']) {
 
-            $onlineUsers = $sessionLimitSetting['config']['count'];       // default: 100
-            $alivePeriod = $sessionLimitSetting['config']['period'];      // default: 300
+            $onlineUsers = $sessionLimitSetting['config']['count']; // default: 100
+            $alivePeriod = $sessionLimitSetting['config']['period']; // default: 300
             $isUniqueIp  = $sessionLimitSetting['config']['unique_only']; // false
 
             $this->kernel->limitSession($onlineUsers, $alivePeriod, $isUniqueIp);
@@ -453,7 +453,7 @@ 
 
             $lastResetTime = $cronjobSetting['config']['last_update'];
 
-            if (!empty($lastResetTime) ) {
+            if (!empty($lastResetTime)) {
                 $lastResetTime = strtotime($lastResetTime);
             } else {
                 // @codeCoverageIgnoreStart

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;