Completed
Push — master ( 1b0b82...28bb6d )
by
unknown
05:01
created
src/app/views/trash.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,9 +34,12 @@  discard block
 block discarded – undo
34 34
                                     <span class="pull-left">
35 35
                                         <?php if ($file['type'] == 'file'): ?>
36 36
                                             <i class="fa fa-file-text-o"></i>
37
-                                        <?php else: ?>
37
+                                        <?php else {
38
+    : ?>
38 39
                                             <i class="fa fa-folder-o"></i>
39
-                                        <?php endif; ?>
40
+                                        <?php endif;
41
+}
42
+?>
40 43
                                         <?= $file['slug'] ?>
41 44
                                         <span class="grey"><?= $file['path'] ?></span><br>
42 45
                                         <span class="grey">
@@ -58,11 +61,13 @@  discard block
 block discarded – undo
58 61
                                                 </button>
59 62
                                             </form>
60 63
                                         <?php
61
-                                            else:
64
+                                            else {
65
+                                                :
62 66
                                         ?>
63 67
                                             <span class="grey"><?= $file['reason'] ?></span>
64 68
                                         <?php
65 69
                                             endif;
70
+                                            }
66 71
                                         ?>
67 72
                                     </span>
68 73
                                 </li>
Please login to merge, or discard this patch.
src/app/views/templates/category/index.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,11 +8,11 @@
 block discarded – undo
8 8
 $events_to_display = [];
9 9
 
10 10
 foreach ($events_data as $event) {
11
-    if ( substr($event['path'], 1, $len) == $page_slug && $event['template'] == 'event' ) {
11
+    if (substr($event['path'], 1, $len) == $page_slug && $event['template'] == 'event') {
12 12
         $events_to_display[] = $event;
13 13
     }
14 14
 }
15
-usort($events_to_display, function ($e1, $e2) {
15
+usort($events_to_display, function($e1, $e2) {
16 16
     if (!$e2['data']['start_time']) {
17 17
         return -1;
18 18
     }
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,8 +15,7 @@  discard block
 block discarded – undo
15 15
 usort($events_to_display, function ($e1, $e2) {
16 16
     if (!$e2['data']['start_time']) {
17 17
         return -1;
18
-    }
19
-    else if (!$e1['data']['start_time']) {
18
+    } else if (!$e1['data']['start_time']) {
20 19
         return 1;
21 20
     }
22 21
     return strcmp($e1['data']['start_time'], $e2['data']['start_time']);
@@ -44,9 +43,12 @@  discard block
 block discarded – undo
44 43
                             <p><small><?= ($d = $event['data']['start_time']) ? strftime('%B %e', date_timestamp_get(date_create($d))) : __('To be announced') ?></small></p>
45 44
                         </a>
46 45
                     <?php endforeach; ?>
47
-                <?php else: ?>
46
+                <?php else {
47
+    : ?>
48 48
                     Coming soon
49
-                <?php endif; ?>
49
+                <?php endif;
50
+}
51
+?>
50 52
             </div>
51 53
         </div>
52 54
     </div>
Please login to merge, or discard this patch.
src/app/views/user_edit.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,8 @@  discard block
 block discarded – undo
51 51
                     ?>
52 52
                         <span class="grey">(It's you)</span>
53 53
                     <?php
54
-                        else:
54
+                        else {
55
+                            :
55 56
                     ?>
56 57
                         <form action="" method="post" style="display: inline-block;">
57 58
                             <input type="hidden" name="file_id" value="<?= $id ?>"/>
@@ -63,6 +64,7 @@  discard block
 block discarded – undo
63 64
                         </form>
64 65
                     <?php
65 66
                         endif;
67
+                        }
66 68
                     ?>
67 69
                 </li>
68 70
         <?php
Please login to merge, or discard this patch.
src/app/views/sap/navbar_fragment.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,9 +6,12 @@
 block discarded – undo
6 6
             <li><a href="<?= base_url() ?>sap/portal/">Dashboard</a></li>
7 7
             <li><a href="<?= base_url() ?>sap/portal/leaderboard">Leaderboard</a></li>
8 8
             <li><a href="<?= base_url() ?>sap/logout/">Logout</a></li>
9
-        <?php else: ?>
9
+        <?php else {
10
+    : ?>
10 11
             <li><a href="<?= base_url() ?>sap/login/">Login</a></li>
11
-        <?php endif; ?>
12
+        <?php endif;
13
+}
14
+?>
12 15
     </ul>
13 16
     <a href="javascript:void(0)" class="menu-toggle-button">&equiv;</a>
14 17
     </a>
Please login to merge, or discard this patch.
src/app/views/sap/confirm_users.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,7 +64,8 @@  discard block
 block discarded – undo
64 64
                                 <input type="hidden" name="user-id" value="<?= $user['id'] ?>">
65 65
                                 <button class="btn btn-green">Resend email</button>
66 66
                             </form>
67
-                        <?php else: ?>
67
+                        <?php else {
68
+    : ?>
68 69
                             <form method="post"
69 70
                                 action="<?= base_url() ?>sap/portal/users/approve/<?= $user['id'] ?>"
70 71
                                 onsubmit="return confirm('Are you sure you want to approve <?= htmlspecialchars($user['name']) ?>?')">
@@ -82,6 +83,8 @@  discard block
 block discarded – undo
82 83
             <?php endforeach ?>
83 84
         </table>
84 85
     </div>
85
-    <?php $this->load_fragment('google_analytics'); ?>
86
+    <?php $this->load_fragment('google_analytics');
87
+}
88
+?>
86 89
 </body>
87 90
 </html>
Please login to merge, or discard this patch.
src/app/views/sap/emails/submission_reviewed_email_text.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
 An admin has approved your submission! :D
17 17
 
18
-<?php else: ?>
18
+<?php else {
19
+    : ?>
19 20
 
20 21
 Unfortunately, an admin has rejected your submission. :/
21 22
 
@@ -24,7 +25,9 @@  discard block
 block discarded – undo
24 25
 
25 26
 <?= $reason ?>
26 27
 
27
-<?php endif; ?>
28
+<?php endif;
29
+}
30
+?>
28 31
 <?php endif; ?>
29 32
 
30 33
 Link to mission: <?= $mission_url?>
Please login to merge, or discard this patch.
src/app/views/sap/emails/submission_reviewed_email_html.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,14 +24,17 @@
 block discarded – undo
24 24
         <?php endif; ?>
25 25
         <?php if ($approved): ?>
26 26
             <p>An admin has approved your submission! :D</p>
27
-        <?php else: ?>
27
+        <?php else {
28
+    : ?>
28 29
             <p>Unfortunately, an admin has rejected your submission. :/</p>
29 30
             <?php if (isset($reason)): ?>
30 31
                 <p>The reason given was:</p>
31 32
                 <blockquote>
32 33
                     <?= $reason ?>
33 34
                 </blockquote>
34
-            <?php endif; ?>
35
+            <?php endif;
36
+}
37
+?>
35 38
         <?php endif; ?>
36 39
         <p>Link to mission: <a href="<?= $mission_url ?>"><?= $mission_url?> </a></p>
37 40
         <p>
Please login to merge, or discard this patch.
src/app/views/sap/mission.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
         <?php if (isset($mission['description'])): ?>
22 22
             <p><?= linkify(nl2br(htmlspecialchars($mission['description']))) ?></p>
23 23
         <?php endif; ?>
24
-        <?php if(!$mission['published']): ?>
24
+        <?php if (!$mission['published']): ?>
25 25
             <p>This mission is unpublished.</p>
26 26
             <form method="post" action="./publish">
27 27
                 <button type="submit" class="btn btn-red">Publish mission</button>
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             </strong>
41 41
         </p>
42 42
         <?php if ($is_admin): ?>
43
-            <?php if(!$mission['published']): ?>
43
+            <?php if (!$mission['published']): ?>
44 44
                 <a href="./createtask/" class="btn btn-green">Create new task</a>
45 45
             <?php endif; ?>
46 46
             <a href="../../review/mission/<?= $mission['id'] ?>/" class="btn btn-blue">
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@  discard block
 block discarded – undo
66 66
                 <?php elseif ($task['submission']['done'] == 1): ?>
67 67
                     <p class="text-success"><strong>Done! :)</strong></p>
68 68
                 <?php endif; ?>
69
-            <?php else: ?>
69
+            <?php else {
70
+    : ?>
70 71
                 <form class="block" method="post" action="./submittask/">
71 72
                     <p><?= linkify(nl2br(htmlspecialchars($task['description']))) ?></p>
72 73
                     <?php if (isset($task['submission']) && $task['submission']['done'] == 2): ?>
@@ -76,7 +77,9 @@  discard block
 block discarded – undo
76 77
                                 <strong>Reason given</strong>:<br>
77 78
                                 <?= nl2br(htmlspecialchars($task['submission']['reason'])) ?>
78 79
                             </p>
79
-                        <?php endif; ?>
80
+                        <?php endif;
81
+}
82
+?>
80 83
                     <?php endif; ?>
81 84
                     <?php if ($task['has_text_answer']): ?>
82 85
                         <textarea name="text-answer" required></textarea>
Please login to merge, or discard this patch.
src/app/views/sap/leaderboard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
             foreach ($user_scores as $user_score) {
23 23
                 $name = $user_score['name'];
24 24
                 $score = $user_score['score'];
25
-                if ($score_prev > $score){
25
+                if ($score_prev > $score) {
26 26
                     $score_prev = $score;
27 27
                     $rank += 1;
28 28
                 }
Please login to merge, or discard this patch.