Completed
Branch 1.x (bc5d7e)
by Terry
03:05
created
templates/panel/action_log_this_month.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 ?>
15 15
 
16 16
 <div class="so-dashboard">
17
-    <?php if (! empty($period_data)) : ?>
17
+    <?php if (!empty($period_data)) : ?>
18 18
     <div class="so-flex">
19 19
         <div class="so-board">
20 20
             <div class="board-field left">
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
                 </tr>
86 86
             </thead>
87 87
             <tbody>
88
-                <?php if (! empty($ip_details)) : ?>
89
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
88
+                <?php if (!empty($ip_details)) : ?>
89
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
90 90
                 <tr>
91 91
                     <td>
92 92
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         </table>
109 109
     </div>
110 110
     <div class="so-timezone">
111
-        <?php if (! empty($last_cached_time)) : ?>
111
+        <?php if (!empty($last_cached_time)) : ?>
112 112
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
113 113
             &nbsp;&nbsp;&nbsp;&nbsp; 
114 114
         <?php endif; ?>
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 <?php
120 120
 
121
-    if (! empty($period_data)) {
121
+    if (!empty($period_data)) {
122 122
         $data['period_data'] = $period_data;
123 123
         $this->_include('panel/js/chart', $data);
124 124
     }
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,9 +60,12 @@
 block discarded – undo
60 60
                 </div>
61 61
             </div>
62 62
         </div>
63
-    <?php else : ?>
63
+    <?php else {
64
+    : ?>
64 65
         <div class="alert alert-danger">
65
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
66
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
67
+}
68
+?>
66 69
             
67 70
         </div>
68 71
     <?php endif; ?>
Please login to merge, or discard this patch.
templates/panel/exclusion.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,8 +73,8 @@
 block discarded – undo
73 73
                 </tr>
74 74
             </thead>
75 75
             <tbody>
76
-                <?php if (! empty($exclusion_list)) : ?>
77
-                <?php foreach($exclusion_list as $i => $urlInfo) : ?>
76
+                <?php if (!empty($exclusion_list)) : ?>
77
+                <?php foreach ($exclusion_list as $i => $urlInfo) : ?>
78 78
                 <tr>
79 79
                     <td><?php echo $urlInfo['url']; ?></td>
80 80
                     <td><button type="button" class="button btn-remove-ip" data-order="<?php echo $i; ?>"><i class="far fa-trash-alt"></i></button></td>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,8 @@  discard block
 block discarded – undo
54 54
             </tbdoy>
55 55
         </table>
56 56
     </div>
57
-    <?php else: ?>
57
+    <?php else {
58
+    : ?>
58 59
     <div id="so-table-loading" class="so-datatables">
59 60
         <div class="lds-css ng-scope">
60 61
             <div class="lds-ripple">
@@ -63,7 +64,9 @@  discard block
 block discarded – undo
63 64
             </div>
64 65
         </div>
65 66
     </div>
66
-    <?php endif; ?>
67
+    <?php endif;
68
+}
69
+?>
67 70
     <div id="so-table-container" class="so-datatables" style="display: none;">
68 71
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
69 72
             <thead>
Please login to merge, or discard this patch.
templates/panel/template.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     $page = $_GET['so_page'] ?? '';
21 21
     $tab  = $_GET['tab'] ?? '';
22 22
 
23
-    $currentPage = $page . (! empty($tab) ? '_' . $tab : '');
23
+    $currentPage = $page . (!empty($tab) ? '_' . $tab : '');
24 24
 
25 25
     if ($currentPage === $key) {
26 26
         echo 'active';
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 $staticSrc = 'https://shieldon-io.github.io/static';
31 31
 
32 32
 // `project.lo` is the virtual domain that Terry is using to test Shieldon library.
33
-if (isset($_SERVER['HTTP_HOST']) && strpos($_SERVER['HTTP_HOST'], 'project.lo') !== false)  {
33
+if (isset($_SERVER['HTTP_HOST']) && strpos($_SERVER['HTTP_HOST'], 'project.lo') !== false) {
34 34
     // `shieldon-doc.lo` is the virtual domain that Terry is using to design CSS for Firewall Panel UI.
35 35
     $staticSrc = 'http://shieldon-doc.lo/static';
36 36
 }
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
             </div>
265 265
         </div>
266 266
 
267
-        <?php if (! empty($this->messages)) : ?>
267
+        <?php if (!empty($this->messages)) : ?>
268 268
         <div id="message-modal" class="modal fade" tabindex="-1" role="dialog">
269 269
             <div class="modal-dialog modal-dialog-centered modal-lightbox" role="document">
270 270
                 <div class="modal-content">
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -279,11 +279,14 @@
 block discarded – undo
279 279
                                     <i class="fas fa-times-circle"></i>
280 280
                                 <?php endif; ?>
281 281
                             </div>
282
-                            <?php else: ?>
282
+                            <?php else {
283
+    : ?>
283 284
                                 <div class="icon-box">
284 285
                                     <i class="fas fa-exclamation-circle"></i>
285 286
                                 </div>
286
-                            <?php endif; ?>
287
+                            <?php endif;
288
+}
289
+?>
287 290
                         </div>
288 291
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
289 292
                             <span aria-hidden="true">&times;</span>
Please login to merge, or discard this patch.
templates/panel/js/chart.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     var captchaCount = <?php echo ($period_data['captcha_count'] ?? 0); ?>;
18 18
 
19 19
     // Today
20
-    <?php if (! empty($past_seven_hours)) : ?>
20
+    <?php if (!empty($past_seven_hours)) : ?>
21 21
     var pageviewChartString = [<?php echo ($past_seven_hours['pageview_chart_string'] ?? ''); ?>];
22 22
     var captchaChartString = [<?php echo ($past_seven_hours['captcha_chart_string'] ?? ''); ?>];
23 23
     var labelChartString = [<?php echo ($past_seven_hours['label_chart_string'] ?? ''); ?>];
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,11 @@
 block discarded – undo
21 21
     var pageviewChartString = [<?php echo ($past_seven_hours['pageview_chart_string'] ?? ''); ?>];
22 22
     var captchaChartString = [<?php echo ($past_seven_hours['captcha_chart_string'] ?? ''); ?>];
23 23
     var labelChartString = [<?php echo ($past_seven_hours['label_chart_string'] ?? ''); ?>];
24
-    <?php else : ?>
25
-    var pageviewChartString = [<?php echo ($period_data['pageview_chart_string'] ?? ''); ?>];
24
+    <?php else {
25
+    : ?>
26
+    var pageviewChartString = [<?php echo ($period_data['pageview_chart_string'] ?? '');
27
+}
28
+?>];
26 29
     var captchaChartString = [<?php echo ($period_data['captcha_chart_string'] ?? ''); ?>];
27 30
     var labelChartString = [<?php echo ($period_data['label_chart_string'] ?? ''); ?>];
28 31
     <?php endif; ?>
Please login to merge, or discard this patch.
templates/panel/ip_manager.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
         </div>
58 58
     </div>
59 59
     <br />
60
-    <?php if ( empty($ip_list)) : ?>
60
+    <?php if (empty($ip_list)) : ?>
61 61
     <div id="so-table-container" class="so-datatables">
62 62
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
63 63
             <tbody>
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
                 </tr>
93 93
             </thead>
94 94
             <tbody>
95
-                <?php if (! empty($ip_list)) : ?>
96
-                <?php foreach($ip_list as $i => $ipInfo) : ?>
95
+                <?php if (!empty($ip_list)) : ?>
96
+                <?php foreach ($ip_list as $i => $ipInfo) : ?>
97 97
                 <tr>
98 98
                     <td><?php echo $i + 1; ?></td>
99 99
                     <td><?php echo $ipInfo['url']; ?></td>
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     </div>
116 116
 </div>
117 117
 
118
-<?php if (! empty($ip_list)) : ?>
118
+<?php if (!empty($ip_list)) : ?>
119 119
 
120 120
 <script>
121 121
 
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,8 @@  discard block
 block discarded – undo
69 69
             </tbdoy>
70 70
         </table>
71 71
     </div>
72
-    <?php else: ?>
72
+    <?php else {
73
+    : ?>
73 74
     <div id="so-table-loading" class="so-datatables">
74 75
         <div class="lds-css ng-scope">
75 76
             <div class="lds-ripple">
@@ -78,7 +79,9 @@  discard block
 block discarded – undo
78 79
             </div>
79 80
         </div>
80 81
     </div>
81
-    <?php endif; ?>
82
+    <?php endif;
83
+}
84
+?>
82 85
 
83 86
     <div id="so-table-container" class="so-datatables" style="display: none;">
84 87
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
Please login to merge, or discard this patch.
templates/panel/xss_protection.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         </div>
112 112
     </div>
113 113
     <br />
114
-    <?php if ( empty($xss_protected_list)) : ?>
114
+    <?php if (empty($xss_protected_list)) : ?>
115 115
     <div id="so-table-container" class="so-datatables">
116 116
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
117 117
             <tbody>
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
                 </tr>
144 144
             </thead>
145 145
             <tbody>
146
-                <?php if (! empty($xss_protected_list)) : ?>
147
-                <?php foreach($xss_protected_list as $i => $info) : ?>
146
+                <?php if (!empty($xss_protected_list)) : ?>
147
+                <?php foreach ($xss_protected_list as $i => $info) : ?>
148 148
                 <tr>
149 149
                     <td><?php echo $info['type']; ?></td>
150 150
                     <td><?php echo $info['variable']; ?></td>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,7 +123,8 @@  discard block
 block discarded – undo
123 123
             </tbdoy>
124 124
         </table>
125 125
     </div>
126
-    <?php else: ?>
126
+    <?php else {
127
+    : ?>
127 128
     <div id="so-table-loading" class="so-datatables">
128 129
         <div class="lds-css ng-scope">
129 130
             <div class="lds-ripple">
@@ -132,7 +133,9 @@  discard block
 block discarded – undo
132 133
             </div>
133 134
         </div>
134 135
     </div>
135
-    <?php endif; ?>
136
+    <?php endif;
137
+}
138
+?>
136 139
     <div id="so-table-container" class="so-datatables" style="display: none;">
137 140
         <table id="so-datalog" class="cell-border compact stripe responsive" cellspacing="0" width="100%">
138 141
             <thead>
Please login to merge, or discard this patch.
templates/panel/table_sessions.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             </div>
36 36
             <div class="board-field right">
37 37
                 <div class="heading"><?php _e('panel', 'table_heading_period', 'Period'); ?></div>
38
-                <div class="nums"><?php echo number_format($session_limit_period ); ?></div>
38
+                <div class="nums"><?php echo number_format($session_limit_period); ?></div>
39 39
                 <div class="note"><?php _e('panel', 'table_note_period', 'Keep-alive period. (minutes)'); ?></div>
40 40
             </div>
41 41
         </div>
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             </div>
46 46
             <div class="board-field right">
47 47
                 <div class="heading"><?php _e('panel', 'table_heading_online', 'Online'); ?></div>
48
-                <div class="nums"><?php echo number_format($online_count ); ?></div>
48
+                <div class="nums"><?php echo number_format($online_count); ?></div>
49 49
                 <div class="note"><?php _e('panel', 'table_note_online', 'Online session amount.'); ?></div>
50 50
             </div>
51 51
         </div>
@@ -80,19 +80,19 @@  discard block
 block discarded – undo
80 80
             <tbody>
81 81
 
82 82
                 <?php $i = 1; ?>
83
-                <?php foreach($session_list as $key => $sessionInfo) : ?>
83
+                <?php foreach ($session_list as $key => $sessionInfo) : ?>
84 84
                     <?php
85 85
 
86 86
                         $remainsTime = $expires - (time() - $sessionInfo['time']);
87 87
 
88
-                        if ($remainsTime < 1 ) {
88
+                        if ($remainsTime < 1) {
89 89
                             $remainsTime = 0;
90 90
                         }
91 91
 
92
-                        if ($i < $session_limit_count ) {
92
+                        if ($i < $session_limit_count) {
93 93
                             $satusName = __('panel', 'table_text_allowable', 'Allowable');
94 94
 
95
-                            if ($remainsTime < 1 ) {
95
+                            if ($remainsTime < 1) {
96 96
                                 $satusName = __('panel', 'table_text_expired', 'Expired');
97 97
                             }
98 98
                         } else {
Please login to merge, or discard this patch.
templates/panel/action_log_last_month.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 ?>
15 15
 
16 16
 <div class="so-dashboard">
17
-    <?php if (! empty($period_data)) : ?>
17
+    <?php if (!empty($period_data)) : ?>
18 18
     <div class="so-flex">
19 19
         <div class="so-board">
20 20
             <div class="board-field left">
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
                 </tr>
86 86
             </thead>
87 87
             <tbody>
88
-                <?php if (! empty($ip_details)) : ?>
89
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
88
+                <?php if (!empty($ip_details)) : ?>
89
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
90 90
                 <tr>
91 91
                     <td>
92 92
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         </table>
109 109
     </div>
110 110
     <div class="so-timezone">
111
-        <?php if (! empty($last_cached_time)) : ?>
111
+        <?php if (!empty($last_cached_time)) : ?>
112 112
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
113 113
             &nbsp;&nbsp;&nbsp;&nbsp; 
114 114
         <?php endif; ?>
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 <?php
120 120
 
121
-    if (! empty($period_data)) {
121
+    if (!empty($period_data)) {
122 122
         $data['period_data'] = $period_data;
123 123
         $this->_include('panel/js/chart', $data);
124 124
     }
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,9 +60,12 @@
 block discarded – undo
60 60
                 </div>
61 61
             </div>
62 62
         </div>
63
-    <?php else : ?>
63
+    <?php else {
64
+    : ?>
64 65
         <div class="alert alert-danger">
65
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
66
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
67
+}
68
+?>
66 69
             
67 70
         </div>
68 71
     <?php endif; ?>
Please login to merge, or discard this patch.
templates/panel/action_log_yesterday.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 ?>
15 15
 
16 16
 <div class="so-dashboard">
17
-    <?php if (! empty($period_data)) : ?>
17
+    <?php if (!empty($period_data)) : ?>
18 18
     <div class="so-flex">
19 19
         <div class="so-board">
20 20
             <div class="board-field left">
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
                 </tr>
86 86
             </thead>
87 87
             <tbody>
88
-                <?php if (! empty($ip_details)) : ?>
89
-                <?php foreach($ip_details as $ip => $ipInfo) : ?>
88
+                <?php if (!empty($ip_details)) : ?>
89
+                <?php foreach ($ip_details as $ip => $ipInfo) : ?>
90 90
                 <tr>
91 91
                     <td>
92 92
                         <?php if ($this->mode === 'demo') : ?>
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         </table>
109 109
     </div>
110 110
     <div class="so-timezone">
111
-        <?php if (! empty($last_cached_time)) : ?>
111
+        <?php if (!empty($last_cached_time)) : ?>
112 112
             <?php _e('panel', 'log_label_cache_time', 'Report generated time'); ?>: <strong class="text-info"><?php echo $last_cached_time; ?></strong>
113 113
             &nbsp;&nbsp;&nbsp;&nbsp; 
114 114
         <?php endif; ?>
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 <?php
120 120
 
121
-    if (! empty($period_data)) {
121
+    if (!empty($period_data)) {
122 122
         $data['period_data'] = $period_data;
123 123
         $this->_include('panel/js/chart', $data);
124 124
     }
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,9 +60,12 @@
 block discarded – undo
60 60
                 </div>
61 61
             </div>
62 62
         </div>
63
-    <?php else : ?>
63
+    <?php else {
64
+    : ?>
64 65
         <div class="alert alert-danger">
65
-            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.'); ?>
66
+            <?php _e('panel', 'log_msg_no_logger', 'Sorry, you have to implement ActionLogger to use this function.');
67
+}
68
+?>
66 69
             
67 70
         </div>
68 71
     <?php endif; ?>
Please login to merge, or discard this patch.