terrylinooo / shieldon

templates/panel/table_filter_logs.php

Spacing +5 added lines, -5 removed lines

@@ -53,21 +53,21 @@
                 </tr>
             </thead>
             <tbody>
-                <?php foreach($ip_log_list as $ipInfo) : ?>
-                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true ); ?>
+                <?php foreach ($ip_log_list as $ipInfo) : ?>
+                    <?php $logData = is_array($ipInfo['log_data']) ? $ipInfo['log_data'] : json_decode($ipInfo['log_data'], true); ?>
                     <?php
 
                         $text_warning = '';
 
-                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100 ) {
+                        if ($logData['pageviews_m'] > 6 || $logData['pageviews_h'] > 50 || $logData['pageviews_d'] > 100) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2 ) {
+                        if ($logData['flag_js_cookie'] > 2 || $logData['flag_multi_session'] > 2 || $logData['flag_empty_referer'] > 2) {
                             $text_warning = '<span class="so-text-warning"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
 
-                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3 ) {
+                        if ($logData['flag_js_cookie'] > 3 || $logData['flag_multi_session'] > 3 || $logData['flag_empty_referer'] > 3) {
                             $text_warning = '<span class="so-text-danger"><i class="fas fa-exclamation-triangle"></i></span>';
                         }
                     ?>

templates/panel/action_log_past_seven_days.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/iptables_manager.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,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)'; ?>
@@ -57,7 +57,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>
@@ -144,9 +144,9 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ipCommand)) : ?>
-                <?php foreach($ipCommand as $i => $ipInfo) : ?>
-                <?php $subnet = (! empty($ipInfo[3]) && $ipInfo[3] !== 'null') ? '/' . $ipInfo[3] : '' ?>
+                <?php if (!empty($ipCommand)) : ?>
+                <?php foreach ($ipCommand as $i => $ipInfo) : ?>
+                <?php $subnet = (!empty($ipInfo[3]) && $ipInfo[3] !== 'null') ? '/' . $ipInfo[3] : '' ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -176,7 +176,7 @@ 
     </div>
 </div>
 
-<?php if (! empty($ipCommand)) : ?>
+<?php if (!empty($ipCommand)) : ?>
 
 <script>
 

Braces +17 added lines, -5 removed lines

@@ -46,9 +46,18 @@ 
                         <option value="null">---</option>
                         <?php for ($i = 32; $i > 0; $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)'; ?>
+                            <?php if ($i === 8) {
+    $label = $i . ' (A)';
+}
+?>
+                            <?php if ($i === 16) {
+    $label = $i . ' (B)';
+}
+?>
+                            <?php if ($i === 24) {
+    $label = $i . ' (C)';
+}
+?>
                             <option value="<?php echo $i; ?>"><?php echo $label; ?></option>
                         <?php endfor; ?>
                     </select>
@@ -122,7 +131,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">
@@ -131,7 +141,9 @@ 
             </div>
         </div>
     </div>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     <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%">
             <thead>

templates/panel/authentication.php

Spacing +2 added lines, -2 removed lines

@@ -83,8 +83,8 @@
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($authentication_list)) : ?>
-                <?php foreach($authentication_list as $i => $authInfo) : ?>
+                <?php if (!empty($authentication_list)) : ?>
+                <?php foreach ($authentication_list as $i => $authInfo) : ?>
                 <tr>
                     <td><?php echo $authInfo['url']; ?></td>
                     <td><?php echo $authInfo['user']; ?></td>

Braces +5 added lines, -2 removed lines

@@ -62,7 +62,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">
@@ -71,7 +72,9 @@ 
             </div>
         </div>
     </div>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     <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%">
             <thead>

templates/panel/setting/daemon.php

Braces +5 added lines, -2 removed lines

@@ -300,9 +300,12 @@
                 <div>
                     <?php if ($this->mode === 'demo') : ?>
                         <code id="code1" style="display: none">* * * * * root bash your_project_folder/vendor/shieldon/bin/firewall.sh --watch=your_watching_folder >> /var/log/shieldon.log 2>&1</code>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                         <code id="code1" style="display: none">* * * * * root bash <?php echo realpath(__DIR__ . '/../../../bin/firewall.sh') ?> --watch=<span id="iptables-watch-folder"></span> >> /var/log/shieldon.log 2>&1</code>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                     
                     <textarea id="code2" class="form-control" rows="4" style="font-size: 12px; font-family: monospace;"></textarea>
                 </div><br />

templates/panel/action_log_today.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">
@@ -84,8 +84,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') : ?>
@@ -107,7 +107,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; ?>
@@ -117,7 +117,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $data['past_seven_hours'] = $past_seven_hours;
         $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/table_rules.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
         </div>
     </div>
     <?php endif; ?>
-    <?php if (! empty($rule_list)) : ?>
+    <?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%">
             <thead>
@@ -77,7 +77,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php foreach($rule_list as $ipInfo) : ?>
+                <?php foreach ($rule_list as $ipInfo) : ?>
                 <tr>
                     <td>
                         <?php if ($this->mode === 'demo') : ?>
@@ -88,15 +88,15 @@ 
                     <td><?php echo $ipInfo['ip_resolve']; ?></td>
                     <td>
                         <?php 
-                            if (! empty($type_mapping[$ipInfo['type'] ]) ) {
-                                echo $type_mapping[$ipInfo['type'] ];
+                            if (!empty($type_mapping[$ipInfo['type']])) {
+                                echo $type_mapping[$ipInfo['type']];
                             }
                         ?>
                     </td>
                     <td>
                         <?php
-                            if (! empty($reason_mapping[$ipInfo['reason'] ]) ) {
-                                echo $reason_mapping[$ipInfo['reason'] ];
+                            if (!empty($reason_mapping[$ipInfo['reason']])) {
+                                echo $reason_mapping[$ipInfo['reason']];
                             }
                         ?>
                     </td>

Braces +5 added lines, -2 removed lines

@@ -53,7 +53,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">
@@ -62,7 +63,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/overview.php

Spacing +4 added lines, -4 removed lines

@@ -277,7 +277,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>
                     <button class="note-code" onclick="openInfoModal(this)" 
@@ -302,7 +302,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>
                     <button class="note-code" onclick="openInfoModal(this)" 
@@ -317,7 +317,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>
                     <button class="note-code" onclick="openInfoModal(this)" 
@@ -343,7 +343,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>

templates/panel/iptables_status.php

Spacing +2 added lines, -2 removed lines

@@ -30,11 +30,11 @@
     </div>
     <br />
     <div class="so-datatables">
-        <?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; ?>
-        <?php if (! empty($ipStatus)) : ?>
+        <?php if (!empty($ipStatus)) : ?>
             <pre><?php echo nl2br($ipStatus); ?></pre>
         <?php endif; ?>
     </div>