terrylinooo / shieldon

templates/panel/action_log_past_seven_days.php

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; ?>

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,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">
@@ -89,7 +89,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_details)) : ?>
+                <?php if (!empty($ip_details)) : ?>
                 <?php foreach ($ip_details as $ip => $ipInfo) : ?>
                 <tr>
                     <td>
@@ -112,7 +112,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; ?>
@@ -122,7 +122,7 @@ 
 
 <?php
 
-    if (! empty($period_data)) {
+    if (!empty($period_data)) {
         $data['period_data'] = $period_data;
         $this->_include('panel/js/chart', $data);
     }

templates/panel/iptables_manager.php

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>

Spacing +5 added lines, -5 removed lines

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

templates/panel/authentication.php

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>

Spacing +1 added lines, -1 removed lines

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

templates/panel/table_rules.php

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%">

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,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>
@@ -92,15 +92,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>

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>

templates/panel/operation_status.php

Braces +45 added lines, -18 removed lines

@@ -27,8 +27,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>
@@ -43,8 +46,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>
@@ -59,8 +65,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>
@@ -75,8 +84,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>
@@ -101,8 +113,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>
@@ -117,8 +132,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>
@@ -133,8 +151,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>
@@ -149,8 +170,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>
@@ -165,8 +189,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>

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_cookie', 'Cookie'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($filter_cookie)) : ?>
+                        <?php if (!empty($filter_cookie)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_cookie; ?></a>
                         <?php else : ?>
                             <?php echo $filter_cookie; ?>
@@ -45,7 +45,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_session', 'Session'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($filter_session)) : ?>
+                        <?php if (!empty($filter_session)) : ?>
                             <a href="#" onclick="displayLogs('session');"><?php echo $filter_session; ?></a>
                         <?php else : ?>
                             <?php echo $filter_session; ?>
@@ -61,7 +61,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_frequency', 'Frequency'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($filter_frequency)) : ?>
+                        <?php if (!empty($filter_frequency)) : ?>
                             <a href="#" onclick="displayLogs('frequency');"><?php echo $filter_frequency; ?></a>
                         <?php else : ?>
                             <?php echo $filter_frequency; ?>
@@ -77,7 +77,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_referer', 'Referrer'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($filter_referer)) : ?>
+                        <?php if (!empty($filter_referer)) : ?>
                             <a href="#" onclick="displayLogs('referer');"><?php echo $filter_referer; ?></a>
                         <?php else : ?>
                             <?php echo $filter_referer; ?>
@@ -103,7 +103,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_ip', 'IP'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($component_ip)) : ?>
+                        <?php if (!empty($component_ip)) : ?>
                             <a href="#" onclick="displayLogs('ip');"><?php echo $component_ip; ?></a>
                         <?php else : ?>
                             <?php echo $component_ip; ?>
@@ -119,7 +119,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_trustedbot', 'Trusted Bot'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($component_trustedbot)) : ?>
+                        <?php if (!empty($component_trustedbot)) : ?>
                             <a href="#" onclick="displayLogs('trustedbot');"><?php echo $component_trustedbot; ?></a>
                         <?php else : ?>
                             <?php echo $component_trustedbot; ?>
@@ -135,7 +135,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_header', 'Header'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($component_header)) : ?>
+                        <?php if (!empty($component_header)) : ?>
                             <a href="#" onclick="displayLogs('header');"><?php echo $component_header; ?></a>
                         <?php else : ?>
                             <?php echo $component_header; ?>
@@ -151,7 +151,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_rdns', 'RDNS'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($component_rdns)) : ?>
+                        <?php if (!empty($component_rdns)) : ?>
                             <a href="#" onclick="displayLogs('rdns');"><?php echo $component_rdns; ?></a>
                         <?php else : ?>
                             <?php echo $component_rdns; ?>
@@ -167,7 +167,7 @@ 
                 <div class="filter-status">
                     <div class="heading"><?php _e('panel', 'overview_label_useragent', 'User Agent'); ?></div>
                     <div class="nums">
-                        <?php if (! empty($component_useragent)) : ?>
+                        <?php if (!empty($component_useragent)) : ?>
                             <a href="#" onclick="displayLogs('useragent');"><?php echo $component_useragent; ?></a>
                         <?php else : ?>
                             <?php echo $component_useragent; ?>
@@ -214,15 +214,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>

templates/panel/template.php

Braces +5 added lines, -2 removed lines

@@ -279,11 +279,14 @@
                                     <i class="fas fa-times-circle"></i>
                                 <?php endif; ?>
                             </div>
-                            <?php else: ?>
+                            <?php else {
+    : ?>
                                 <div class="icon-box">
                                     <i class="fas fa-exclamation-circle"></i>
                                 </div>
-                            <?php endif; ?>
+                            <?php endif;
+}
+?>
                         </div>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
 if (
     isset($_SERVER['HTTP_HOST']) && 
     strpos($_SERVER['HTTP_HOST'], 'project.lo') !== false
-)  {
+) {
     // `shieldon-doc.lo` is the virtual domain that Terry is using to design CSS for Firewall Panel UI.
     $staticSrc = 'http://shieldon-doc.lo/static';
 }
@@ -330,7 +330,7 @@ 
                 </div>
             </div>
         </div>
-        <?php if (! empty($this->messages)) : ?>
+        <?php if (!empty($this->messages)) : ?>
         <div id="message-modal" class="modal fade" tabindex="-1" role="dialog">
             <div class="modal-dialog modal-dialog-centered modal-lightbox" role="document">
                 <div class="modal-content">

templates/panel/js/chart.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     var captchaCount = <?php echo ($period_data['captcha_count'] ?? 0); ?>;
 
     // Today
-    <?php if (! empty($past_seven_hours)) : ?>
+    <?php if (!empty($past_seven_hours)) : ?>
     var pageviewChartString = [<?php echo ($past_seven_hours['pageview_chart_string'] ?? ''); ?>];
     var captchaChartString = [<?php echo ($past_seven_hours['captcha_chart_string'] ?? ''); ?>];
     var labelChartString = [<?php echo ($past_seven_hours['label_chart_string'] ?? ''); ?>];

Braces +5 added lines, -2 removed lines

@@ -21,8 +21,11 @@
     var pageviewChartString = [<?php echo ($past_seven_hours['pageview_chart_string'] ?? ''); ?>];
     var captchaChartString = [<?php echo ($past_seven_hours['captcha_chart_string'] ?? ''); ?>];
     var labelChartString = [<?php echo ($past_seven_hours['label_chart_string'] ?? ''); ?>];
-    <?php else : ?>
-    var pageviewChartString = [<?php echo ($period_data['pageview_chart_string'] ?? ''); ?>];
+    <?php else {
+    : ?>
+    var pageviewChartString = [<?php echo ($period_data['pageview_chart_string'] ?? '');
+}
+?>];
     var captchaChartString = [<?php echo ($period_data['captcha_chart_string'] ?? ''); ?>];
     var labelChartString = [<?php echo ($period_data['label_chart_string'] ?? ''); ?>];
     <?php endif; ?>

templates/panel/ip_manager.php

Braces +5 added lines, -2 removed lines

@@ -69,7 +69,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">
@@ -78,7 +79,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%">

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,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>
@@ -96,7 +96,7 @@ 
                 </tr>
             </thead>
             <tbody>
-                <?php if (! empty($ip_list)) : ?>
+                <?php if (!empty($ip_list)) : ?>
                 <?php foreach ($ip_list as $i => $ipInfo) : ?>
                 <tr>
                     <td><?php echo $i + 1; ?></td>
@@ -119,7 +119,7 @@ 
     </div>
 </div>
 
-<?php if (! empty($ip_list)) : ?>
+<?php if (!empty($ip_list)) : ?>
 
 <script>