Completed
Push — master ( 47fcc2...df93ac )
by Christopher
16s
created
public/old/series.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -142,10 +142,10 @@
 block discarded – undo
142 142
 	</form>
143 143
 </div><!-- /.box -->
144 144
   <?php
145
-  if (isAdmin()) {
146
-      ?>
145
+    if (isAdmin()) {
146
+        ?>
147 147
   <div id="right">
148 148
   		<div class="item"><a href="settings.php">Back to settings</a></div>
149 149
 <?php
150
-  } ?>
150
+    } ?>
151 151
 <?php include 'includes/footer.php'; ?>
Please login to merge, or discard this patch.
public/old/locations.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
         }
55 55
 
56 56
         // After we have inserted the data, we want to head back to the main users page
57
-     header('Location: locations.php'); // Move to the home page of the admin section
58
-      exit;
57
+        header('Location: locations.php'); // Move to the home page of the admin section
58
+        exit;
59 59
     }
60 60
 }
61 61
 
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
121 121
 	</form>
122 122
 </div><!-- /.box -->
123 123
   <?php
124
-  if (isAdmin()) {
125
-      ?>
124
+    if (isAdmin()) {
125
+        ?>
126 126
   <div id="right">
127 127
   		<div class="item"><a href="settings.php">Back to settings</a></div>
128 128
 <?php
129
-  } ?>
129
+    } ?>
130 130
 <?php include 'includes/footer.php'; ?>
Please login to merge, or discard this patch.
api-classes/User.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@
 block discarded – undo
28 28
         $currentTimestamp = $date = strftime('%F %T', time());
29 29
 
30 30
         $data = [
31
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
32
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
33
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
34
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
35
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
36
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
37
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
31
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
32
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
33
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
34
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
35
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()],
36
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
37
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
38 38
     ];
39 39
 
40 40
         if (isset($this->notes)) {
Please login to merge, or discard this patch.
api-classes/Database.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -272,8 +272,8 @@
 block discarded – undo
272 272
     public function count($table, $column, $where = null)
273 273
     {
274 274
         $columns = [
275
-      'COUNT('.$column.') AS count',
276
-     ];
275
+        'COUNT('.$column.') AS count',
276
+        ];
277 277
         $statement = $this->selectStatement($table, $columns, $where);
278 278
 
279 279
         return $statement->fetchObject()->count;
Please login to merge, or discard this patch.
api-classes/Event.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
         $currentTimestamp = $date = strftime('%F %T', time());
132 132
 
133 133
         $data = [
134
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
135
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
136
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
137
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
138
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
139
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
140
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
134
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
135
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
136
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
137
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
138
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
139
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
140
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
141 141
     ];
142 142
 
143 143
         if (isset($this->notes)) {
@@ -164,23 +164,23 @@  discard block
 block discarded – undo
164 164
         }
165 165
 
166 166
         $columns = [
167
-      'id',
168
-      'name',
169
-      'date',
170
-      'eventGroup',
171
-      'type',
172
-      'subType',
173
-      'location',
174
-      'comment',
175
-      'sermonTitle',
176
-      'bibleVerse',
177
-      'deleted',
178
-      'created',
179
-      'updated',
167
+        'id',
168
+        'name',
169
+        'date',
170
+        'eventGroup',
171
+        'type',
172
+        'subType',
173
+        'location',
174
+        'comment',
175
+        'sermonTitle',
176
+        'bibleVerse',
177
+        'deleted',
178
+        'created',
179
+        'updated',
180 180
     ];
181 181
 
182 182
         $where = [
183
-      'id = '.$id,
183
+        'id = '.$id,
184 184
     ];
185 185
 
186 186
         $result = $db->selectSingle('Event', $this->db_table, $columns, $where);
Please login to merge, or discard this patch.
generated-classes/TechWilk/Rota/User.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
         if (!password_verify($v, $this->password)) {
35 35
             $bcrypt_options = [
36 36
         'cost' => 12,
37
-      ];
37
+        ];
38 38
             $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
39 39
 
40 40
             $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;
Please login to merge, or discard this patch.
public/old/index.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -177,10 +177,10 @@  discard block
 block discarded – undo
177 177
     <div class="col-sm-8 col-md-8 col-lg-6">
178 178
 
179 179
       <?php
180
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
181
-      // ~~~~~~~~ Events this week ~~~~~~~~
182
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
183
-      ?>
180
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
181
+        // ~~~~~~~~ Events this week ~~~~~~~~
182
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
183
+        ?>
184 184
 
185 185
       <h2>Events this week:</h2>
186 186
 
@@ -204,17 +204,17 @@  discard block
 block discarded – undo
204 204
             <div class="timeline-header">
205 205
               <a href="event.php?id=<?php echo $event->getId() ?>">
206 206
                 <h4><?php
207
-                  echo $event->getDate('jS: ');
208
-                  $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
209
-                  $roles = [];
210
-                  foreach ($eventPeople as $eventPerson) {
211
-                      if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
212
-                          $roles[] = $eventPerson->getUserRole()->getRole()->getName();
213
-                      }
214
-                  }
215
-                  $roles = implode(', ', $roles);
216
-                  echo $roles != '' ? $roles : 'No involvement';
217
-                  ?>
207
+                    echo $event->getDate('jS: ');
208
+                    $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
209
+                    $roles = [];
210
+                    foreach ($eventPeople as $eventPerson) {
211
+                        if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
212
+                            $roles[] = $eventPerson->getUserRole()->getRole()->getName();
213
+                        }
214
+                    }
215
+                    $roles = implode(', ', $roles);
216
+                    echo $roles != '' ? $roles : 'No involvement';
217
+                    ?>
218 218
                 </h4>
219 219
               </a>
220 220
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->getEventTypeId() ?>"><?php echo $event->getEventType()->getName() ?></a>
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
                 <div class="modal-body">
270 270
                   <?php
271 271
 
272
-                  $sqlPeople = "SELECT
272
+                    $sqlPeople = "SELECT
273 273
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
274 274
                                 r.name AS `rolename`,
275 275
                                 ep.notified AS `notified`,
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
                                   AND ep.removed = 0
286 286
                                 ORDER BY g.name, r.name";
287 287
 
288
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
289
-                  $groupName = '';
290
-                  $groupId = 0;
291
-                  $identifier = '1';
292
-                  $firstTime = true;
288
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
289
+                    $groupName = '';
290
+                    $groupId = 0;
291
+                    $identifier = '1';
292
+                    $firstTime = true;
293 293
 
294
-                  if (mysqli_num_rows($resultPeople) > 0):
294
+                    if (mysqli_num_rows($resultPeople) > 0):
295 295
 
296 296
                     ?>
297 297
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -324,9 +324,9 @@  discard block
 block discarded – undo
324 324
                         echo '</li>';
325 325
                     }
326 326
                     echo '</ul>';
327
-                  else:
327
+                    else:
328 328
                     echo '<p>No roles assigned to this event.';
329
-                  endif;
329
+                    endif;
330 330
                 ?>
331 331
                 </div>
332 332
                 <div class="modal-footer">
@@ -360,10 +360,10 @@  discard block
 block discarded – undo
360 360
 
361 361
 
362 362
       <?php
363
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
364
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
365
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
366
-      ?>
363
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
364
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
365
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
366
+        ?>
367 367
 
368 368
       <h2>My events:</h2>
369 369
 
@@ -388,9 +388,9 @@  discard block
 block discarded – undo
388 388
             <div class="timeline-header">
389 389
               <a href="event.php?id=<?php echo $event->id ?>">
390 390
                 <h4><?php
391
-                  echo date('jS: ', strtotime($event->date));
392
-                  echo $event->roles;
393
-                  ?>
391
+                    echo date('jS: ', strtotime($event->date));
392
+                    echo $event->roles;
393
+                    ?>
394 394
                 </h4>
395 395
               </a>
396 396
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->eventTypeId ?>"><?php echo $event->eventType ?></a>
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
                 <div class="modal-body">
447 447
                   <?php
448 448
 
449
-                  $sqlPeople = "SELECT
449
+                    $sqlPeople = "SELECT
450 450
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
451 451
                                 r.name AS `rolename`,
452 452
                                 ep.notified AS `notified`,
@@ -462,13 +462,13 @@  discard block
 block discarded – undo
462 462
                                   AND ep.removed = 0
463 463
                                 ORDER BY g.name, r.name";
464 464
 
465
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
466
-                  $groupName = '';
467
-                  $groupId = 0;
468
-                  $identifier = '1';
469
-                  $firstTime = true;
465
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
466
+                    $groupName = '';
467
+                    $groupId = 0;
468
+                    $identifier = '1';
469
+                    $firstTime = true;
470 470
 
471
-                  if (mysqli_num_rows($resultPeople) > 0):
471
+                    if (mysqli_num_rows($resultPeople) > 0):
472 472
 
473 473
                     ?>
474 474
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
@@ -501,9 +501,9 @@  discard block
 block discarded – undo
501 501
                         echo '</li>';
502 502
                     }
503 503
                     echo '</ul>';
504
-                  else:
504
+                    else:
505 505
                     echo '<p>No roles assigned to this event.';
506
-                  endif;
506
+                    endif;
507 507
                 ?>
508 508
                 </div>
509 509
                 <div class="modal-footer">
@@ -538,10 +538,10 @@  discard block
 block discarded – undo
538 538
     <div class="col-sm-4 col-md-4 col-lg-6">
539 539
 
540 540
       <?php
541
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
542
-      // ~~~~~~~ Remaining events ~~~~~~~~~
543
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
544
-      ?>
541
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
542
+        // ~~~~~~~ Remaining events ~~~~~~~~~
543
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
544
+        ?>
545 545
       <?php if (isset($remainingEventsInGroups)): ?>
546 546
 
547 547
       <div class="row">
@@ -617,10 +617,10 @@  discard block
 block discarded – undo
617 617
 
618 618
 
619 619
       <?php
620
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
621
-      // ~~~~~~~~~ User details ~~~~~~~~~~~
622
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
623
-      ?>
620
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
621
+        // ~~~~~~~~~ User details ~~~~~~~~~~~
622
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
623
+        ?>
624 624
 
625 625
       <div class="box box-widget widget-user-2">
626 626
         <div class="widget-user-header bg-yellow">
Please login to merge, or discard this patch.