terrylinooo / shieldon

src/Firewall/Log/ActionLogParser.php

Spacing +29 added lines, -29 removed lines

@@ -208,7 +208,7 @@ 
             default:
 
                 // We also accept querying N days data from logs. For example: `past_365_days`.
-                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'));
@@ -233,7 +233,7 @@ 
         // Fetch data from log files.
         $logs = $this->logger->get($startDate, $endDate);
 
-        foreach($logs as $log) {
+        foreach ($logs as $log) {
 
             $logTimesamp = (int) $log['timesamp'];
             $logIp = $log['ip'];
@@ -331,21 +331,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();
 
@@ -386,22 +386,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)) {
 
@@ -431,7 +431,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) . "'";
@@ -461,7 +461,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/Helpers.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,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/Panel/User.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
             if (
                 // Default password, unencrypted.
-                $admin['user']  === $postParams['s_user'] && 
+                $admin['user'] === $postParams['s_user'] && 
                 'shieldon_pass' === $postParams['s_pass'] &&
                 'shieldon_pass' === $admin['pass']
             ) {

templates/panel/action_log_last_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

Braces +5 added lines, -2 removed lines

@@ -60,9 +60,12 @@
                 </div>
             </div>
         </div>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <div class="alert alert-danger">
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
+}
+?>
             
         </div>
     <?php endif; ?>

templates/panel/action_log_this_month.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

Braces +5 added lines, -2 removed lines

@@ -60,9 +60,12 @@
                 </div>
             </div>
         </div>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <div class="alert alert-danger">
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
+}
+?>
             
         </div>
     <?php endif; ?>

templates/panel/action_log_yesterday.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 ?>
 
 <div class="so-dashboard">
-    <?php if (! empty($period_data)) : ?>
+    <?php if (!empty($period_data)) : ?>
     <div class="so-flex">
         <div class="so-board">
             <div class="board-field left">
@@ -85,8 +85,8 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
+                <?php if (!empty($ip_details)) : ?>
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@ 
         </table>
     </div>
     <div class="so-timezone">
-        <?php if (! empty($last_cached_time)) : ?>
+        <?php if (!empty($last_cached_time)) : ?>
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
             &nbsp;&nbsp;&nbsp;&nbsp; 
         <?php endif; ?>
@@ -118,7 +118,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

Braces +5 added lines, -2 removed lines

@@ -60,9 +60,12 @@
                 </div>
             </div>
         </div>
-    <?php else : ?>
+    <?php else {
+    : ?>
         <div class="alert alert-danger">
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
+}
+?>
             
         </div>
     <?php endif; ?>

templates/panel/overview.php

Spacing +4 added lines, -4 removed lines

@@ -203,7 +203,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_action_logger', 'Action Logger'); ?></div>
                     <div class="nums">
-                        <?php echo $data['action_logger']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $data['action_logger'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_action_logger', 'Record every visitor’s behavior.'); ?></div>
                 </div>
@@ -222,7 +222,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_recaptcha', 'reCAPTCHA'); ?></div>
                     <div class="nums">
-                        <?php echo $captcha['recaptcha']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $captcha['recaptcha'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_recaptcha', 'Provided by Google.'); ?></div>
                 </div>
@@ -231,7 +231,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_image_captcha', 'Image Captcha'); ?></div>
                     <div class="nums">
-                        <?php echo $captcha['imagecaptcha']  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $captcha['imagecaptcha'] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_image_captcha', 'A simple text-in-image Captcha.'); ?></div>
                 </div>
@@ -251,7 +251,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_' . $k, ''); ?></div>
                     <div class="nums">
-                        <?php echo $messengers[$k]  ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
+                        <?php echo $messengers[$k] ? '<i class="far fa-play-circle"></i>' : '<i class="far fa-stop-circle"></i>'; ?>
                     </div>
                     <div class="note"><?php _e('panel', 'overview_note_' . $k, ''); ?></div>
                 </div>

src/Firewall/Kernel.php

Spacing +5 added lines, -5 removed lines

@@ -340,7 +340,7 @@ 
      * 
      * @return void
      */
-    public function __construct(?ServerRequestInterface $request  = null, ?ResponseInterface $response = null)
+    public function __construct(?ServerRequestInterface $request = null, ?ResponseInterface $response = null)
     {
         // Load helper functions. This is the must.
         new Helpers();
@@ -1648,10 +1648,10 @@ 
 
         $ui = [
             'background_image' => $this->dialogUI['background_image'] ?? '',
-            'bg_color'         => $this->dialogUI['bg_color']         ?? '#ffffff',
-            'header_bg_color'  => $this->dialogUI['header_bg_color']  ?? '#212531',
-            'header_color'     => $this->dialogUI['header_color']     ?? '#ffffff',
-            'shadow_opacity'   => $this->dialogUI['shadow_opacity']   ?? '0.2',
+            'bg_color'         => $this->dialogUI['bg_color'] ?? '#ffffff',
+            'header_bg_color'  => $this->dialogUI['header_bg_color'] ?? '#212531',
+            'header_color'     => $this->dialogUI['header_color'] ?? '#ffffff',
+            'shadow_opacity'   => $this->dialogUI['shadow_opacity'] ?? '0.2',
         ];
 
         if (!defined('SHIELDON_VIEW')) {

src/Firewall/Panel/Ajax.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      *
      * @return bool
      */
-    public function  __call($function , $args)
+    public function  __call($function, $args)
     {
         $className = 'Shieldon\Firewall\Panel\Sandbox\\' . $function;