Completed
Push — master ( 00b67b...01e263 )
by Christopher
13:51 queued 07:04
created
public/old/includes/functions.notifications.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     7 => 'swap-pending',
16 16
     8 => 'swap-approved',
17 17
     9 => 'email',
18
-  ];
18
+    ];
19 19
 }
20 20
 
21 21
 function createNotificationForUser($userId, $summary, $body, $typeName, $link = null)
Please login to merge, or discard this patch.
public/old/email.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
     case 'everyone':
52 52
       echo '<p>Function not complete, please wait while we finish writing it.</p><p>Apologies for any inconvinence.</p>';
53 53
         break;
54
-  default:
54
+    default:
55 55
     echo '<p>Error: Insufficient parameters.</p>';
56 56
     echo '<p>Please inform the system administrator</p>';
57 57
     break;
Please login to merge, or discard this patch.
public/old/emails.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
     exit;
36 36
 }
37 37
 if (!isAdmin()) {
38
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
38
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
39 39
     exit;
40 40
 }
41 41
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
     if ($editskillID != '') {
72 72
         $sql = ("INSERT INTO cr_eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
73 73
         if (!mysqli_query(db(), $sql)) {
74
-            die('Error: '.mysqli_error(db()));
74
+            die('Error: ' . mysqli_error(db()));
75 75
         }
76 76
 
77 77
         // After we have inserted the data, we want to head back to the main page
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 
89 89
             $sql = ("INSERT INTO cr_eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
90 90
             if (!mysqli_query(db(), $sql)) {
91
-                die('Error: '.mysqli_error(db()));
91
+                die('Error: ' . mysqli_error(db()));
92 92
             }
93 93
         }
94 94
 
Please login to merge, or discard this patch.
public/old/linkSocialAuth.php 4 patches
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -37,22 +37,22 @@
 block discarded – undo
37 37
     $platform = strtolower($_POST['platform']);
38 38
 
39 39
     switch ($_POST['action']) {
40
-    case 'link':
41
-      switch ($platform) {
40
+        case 'link':
41
+          switch ($platform) {
42 42
         case 'facebook':
43 43
           $_SESSION['fb-callback-url'] = 'fb-link.php';
44 44
           header('Location: fb-login.php');
45 45
           exit;
46
-      }
47
-      break;
48
-    case 'unlink':
49
-      removeSocialAuthFromUserWithId($id, $platform);
50
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
-      break;
52
-
53
-    default:
54
-      // code...
46
+          }
55 47
       break;
48
+        case 'unlink':
49
+          removeSocialAuthFromUserWithId($id, $platform);
50
+          createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
+          break;
52
+
53
+        default:
54
+          // code...
55
+          break;
56 56
   }
57 57
 }
58 58
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
       break;
48 48
     case 'unlink':
49 49
       removeSocialAuthFromUserWithId($id, $platform);
50
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
50
+      createNotificationForUser($id, ucfirst($platform) . ' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51 51
       break;
52 52
 
53 53
     default:
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,14 +106,17 @@
 block discarded – undo
106 106
       <input type="hidden" name="action" value="unlink" />
107 107
       <button class="btn btn-danger">Unlink</button>
108 108
     </form>
109
-    <?php else: ?>
109
+    <?php else {
110
+    : ?>
110 111
     <form action="#" method="post">
111 112
       <input type="hidden" name="id" value="<?php echo $id ?>" />
112 113
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
113 114
       <input type="hidden" name="action" value="link" />
114 115
       <button class="btn btn-primary">Link</button>
115 116
     </form>
116
-    <?php endif; ?>
117
+    <?php endif;
118
+}
119
+?>
117 120
   </div>
118 121
 </div>
119 122
 <?php endforeach; ?>
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,19 +41,19 @@
 block discarded – undo
41 41
       switch ($platform) {
42 42
         case 'facebook':
43 43
           $_SESSION['fb-callback-url'] = 'fb-link.php';
44
-          header('Location: fb-login.php');
45
-          exit;
46
-      }
47
-      break;
44
+            header('Location: fb-login.php');
45
+            exit;
46
+        }
47
+        break;
48 48
     case 'unlink':
49 49
       removeSocialAuthFromUserWithId($id, $platform);
50
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
-      break;
50
+        createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
51
+        break;
52 52
 
53 53
     default:
54 54
       // code...
55 55
       break;
56
-  }
56
+    }
57 57
 }
58 58
 
59 59
 // list of possible social account links (names used as platform names in database)
Please login to merge, or discard this patch.
public/old/index.php 3 patches
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -323,8 +323,10 @@  discard block
 block discarded – undo
323 323
                         echo '</li>';
324 324
                     }
325 325
                     echo '</ul>';
326
-                  else:
326
+                  else {
327
+                      :
327 328
                     echo '<p>No roles assigned to this event.';
329
+                  }
328 330
                   endif;
329 331
                 ?>
330 332
                 </div>
@@ -353,7 +355,8 @@  discard block
 block discarded – undo
353 355
         <a href="events.php?view=all" class="btn btn-primary">view all events</a>
354 356
       </div>
355 357
 
356
-      <?php else: ?>
358
+      <?php else {
359
+    : ?>
357 360
       <p>There are no events this week. <a href="events.php?view=all">View all events</a></p>
358 361
       <?php endif ?>
359 362
 
@@ -374,6 +377,7 @@  discard block
 block discarded – undo
374 377
 
375 378
         <?php // Month separators
376 379
         $newMonth = strftime('%B %Y', strtotime($event->date));
380
+}
377 381
         if ($month != $newMonth):
378 382
         $month = $newMonth;
379 383
         ?>
@@ -500,8 +504,10 @@  discard block
 block discarded – undo
500 504
                         echo '</li>';
501 505
                     }
502 506
                     echo '</ul>';
503
-                  else:
507
+                  else {
508
+                      :
504 509
                     echo '<p>No roles assigned to this event.';
510
+                  }
505 511
                   endif;
506 512
                 ?>
507 513
                 </div>
@@ -527,7 +533,8 @@  discard block
 block discarded – undo
527 533
         <?php endforeach ?>
528 534
       </ul>
529 535
 
530
-      <?php else: ?>
536
+      <?php else {
537
+    : ?>
531 538
       <p>You have no events on the upcoming rota. <a href="events.php">View all events</a></p>
532 539
       <?php endif ?>
533 540
 
@@ -649,6 +656,7 @@  discard block
 block discarded – undo
649 656
               <a href="addUser.php?action=edit">
650 657
                 <?php
651 658
                 $userHasEmail = (strlen($user->getEmail()) > 3);
659
+}
652 660
                 $emailRemindersEnabled = ($userHasEmail && true); // todo: add opt-out for email reminders
653 661
                 ?>
654 662
                 Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert().' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
Please login to merge, or discard this 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.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
             </div><!-- /.timeline-header -->
222 222
 
223 223
             <div class="timeline-body">
224
-              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName().': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '('.$event->getBibleVerse().')' : '' ?></p>
224
+              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName() . ': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '(' . $event->getBibleVerse() . ')' : '' ?></p>
225 225
               <p><strong>Location:</strong> <?php echo $event->getLocation()->getName(); ?></p>
226 226
 
227 227
               <?php if ($event->getComments()): ?>
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
                                   INNER JOIN cr_groups g ON g.id = r.groupId
282 282
                                   INNER JOIN cr_users u ON u.id = ur.userId
283 283
                                   INNER JOIN cr_eventPeople ep ON ep.userRoleId = ur.id
284
-                                WHERE ep.eventId = '".$event->getId()."'
284
+                                WHERE ep.eventId = '".$event->getId() . "'
285 285
                                   AND ep.removed = 0
286 286
                                 ORDER BY g.name, r.name";
287 287
 
@@ -306,16 +306,16 @@  discard block
 block discarded – undo
306 306
                             } else {
307 307
                                 echo '</ul>';
308 308
                             }
309
-                            echo '<p><strong>'.$groupName.'</strong></p>';
309
+                            echo '<p><strong>' . $groupName . '</strong></p>';
310 310
                             echo '<ul>';
311 311
                         }
312 312
 
313 313
                         echo '<li>';
314
-                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
314
+                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
315 315
                         echo $viewPeople->name;
316 316
 
317 317
                         if ($viewPeople->rolename != '') {
318
-                            echo ' - <em>'.$viewPeople->rolename.'</em>';
318
+                            echo ' - <em>' . $viewPeople->rolename . '</em>';
319 319
                         } else {
320 320
                             // If there is no skill, we don't need to mention this.
321 321
                         }
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
             </div><!-- /.timeline-header -->
398 398
 
399 399
             <div class="timeline-body">
400
-              <p><strong><?php echo $event->eventGroup ? $event->eventGroup.': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '('.$event->bibleVerse.')' : '' ?></p>
400
+              <p><strong><?php echo $event->eventGroup ? $event->eventGroup . ': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '(' . $event->bibleVerse . ')' : '' ?></p>
401 401
               <p><strong>Location:</strong> <?php echo $event->eventLocation; ?></p>
402 402
 
403 403
               <?php if ($event->comment != ''): ?>
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
                                   INNER JOIN cr_groups g ON g.id = r.groupId
459 459
                                   INNER JOIN cr_users u ON u.id = ur.userId
460 460
                                   INNER JOIN cr_eventPeople ep ON ep.userRoleId = ur.id
461
-                                WHERE ep.eventId = '".$event->id."'
461
+                                WHERE ep.eventId = '".$event->id . "'
462 462
                                   AND ep.removed = 0
463 463
                                 ORDER BY g.name, r.name";
464 464
 
@@ -483,16 +483,16 @@  discard block
 block discarded – undo
483 483
                             } else {
484 484
                                 echo '</ul>';
485 485
                             }
486
-                            echo '<p><strong>'.$groupName.'</strong></p>';
486
+                            echo '<p><strong>' . $groupName . '</strong></p>';
487 487
                             echo '<ul>';
488 488
                         }
489 489
 
490 490
                         echo '<li>';
491
-                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
491
+                        echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
492 492
                         echo $viewPeople->name;
493 493
 
494 494
                         if ($viewPeople->rolename != '') {
495
-                            echo ' - <em>'.$viewPeople->rolename.'</em>';
495
+                            echo ' - <em>' . $viewPeople->rolename . '</em>';
496 496
                         } else {
497 497
                             // If there is no skill, we don't need to mention this.
498 498
                         }
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
                   ">
564 564
                   <?php echo timeInWordsWithTense($event->getDate()) ?>
565 565
                 </span>
566
-                <?php else: ?>
566
+                <?php else : ?>
567 567
                 <span class="pull-right badge bg-red">
568 568
                   never
569 569
                 </span>
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
             <img class="img-circle" src="<?php echo getProfileImageUrl($_SESSION['userid'], 'large') ?>" alt="User Avatar">
629 629
           </div>
630 630
           <!-- /.widget-user-image -->
631
-          <h3 class="widget-user-username"><?php echo $user->getFirstName().' '.$user->getLastName() ?></h3>
631
+          <h3 class="widget-user-username"><?php echo $user->getFirstName() . ' ' . $user->getLastName() ?></h3>
632 632
           <h5 class="widget-user-desc">Account created <?php echo $user->getCreated('M. Y') ?></h5>
633 633
         </div>
634 634
         <div class="box-footer no-padding">
@@ -652,7 +652,7 @@  discard block
 block discarded – undo
652 652
                 $userHasEmail = (strlen($user->getEmail()) > 3);
653 653
                 $emailRemindersEnabled = ($userHasEmail && true); // todo: add opt-out for email reminders
654 654
                 ?>
655
-                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert().' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
655
+                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert() . ' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
656 656
               </a>
657 657
             </li>
658 658
             <li>
Please login to merge, or discard this patch.
public/old/logout.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -5,18 +5,18 @@
 block discarded – undo
5 5
 include 'includes/config.php';
6 6
 include 'includes/functions.php';
7 7
 
8
- // you have to open the session first
9
- session_start();
8
+    // you have to open the session first
9
+    session_start();
10 10
 
11 11
     //if ($debug) notifyInfo(__FILE__,"logout",$_SESSION['userid']);	//only_for_testing//
12 12
     if ($debug) {
13 13
         insertStatistics('user', __FILE__, 'logout');
14 14
     }
15 15
 
16
- //remove all the variables in the session
17
- session_unset();
16
+    //remove all the variables in the session
17
+    session_unset();
18 18
 
19
- // destroy the session
20
- session_destroy();
19
+    // destroy the session
20
+    session_destroy();
21 21
 
22
- header('Location: login.php');
22
+    header('Location: login.php');
Please login to merge, or discard this patch.
public/index.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,31 +6,31 @@
 block discarded – undo
6 6
     // To help the built-in PHP dev server, check if the request was actually for
7 7
     // something which should probably be served as a static file
8 8
     $url = parse_url($_SERVER['REQUEST_URI']);
9
-    $file = __DIR__.$url['path'];
9
+    $file = __DIR__ . $url['path'];
10 10
     if (is_file($file)) {
11 11
         return false;
12 12
     }
13 13
 }
14 14
 
15
-require __DIR__.'/../vendor/autoload.php';
15
+require __DIR__ . '/../vendor/autoload.php';
16 16
 
17 17
 // setup Propel (autoload configured though composer)
18
-require_once __DIR__.'/../generated-conf/config.php';
18
+require_once __DIR__ . '/../generated-conf/config.php';
19 19
 
20 20
 session_start();
21 21
 
22 22
 // Instantiate the app
23
-$settings = require __DIR__.'/../src/settings.php';
23
+$settings = require __DIR__ . '/../src/settings.php';
24 24
 $app = new \Slim\App($settings);
25 25
 
26 26
 // Set up dependencies
27
-require __DIR__.'/../src/dependencies.php';
27
+require __DIR__ . '/../src/dependencies.php';
28 28
 
29 29
 // Register middleware
30
-require __DIR__.'/../src/middleware.php';
30
+require __DIR__ . '/../src/middleware.php';
31 31
 
32 32
 // Register routes
33
-require __DIR__.'/../src/routes.php';
33
+require __DIR__ . '/../src/routes.php';
34 34
 
35 35
 // Run app
36 36
 $app->run();
Please login to merge, or discard this patch.
generated-migrations/PropelMigration_1494860053.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     public function getUpSQL()
41 41
     {
42 42
         return [
43
-  'default' => '
43
+    'default' => '
44 44
 # This is a fix for InnoDB in MySQL >= 4.1.x
45 45
 # It "suspends judgement" for fkey relationships until are tables are set.
46 46
 SET FOREIGN_KEY_CHECKS = 0;
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     public function getDownSQL()
173 173
     {
174 174
         return [
175
-  'default' => '
175
+    'default' => '
176 176
 # This is a fix for InnoDB in MySQL >= 4.1.x
177 177
 # It "suspends judgement" for fkey relationships until are tables are set.
178 178
 SET FOREIGN_KEY_CHECKS = 0;
Please login to merge, or discard this patch.
generated-classes/TechWilk/Rota/Document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,16 +22,16 @@
 block discarded – undo
22 22
         }
23 23
         //$acceptedFileExtensions = ['jpg', 'png', 'jpeg', 'gif', 'docx', 'pdf', 'xlsx', 'pptx'];
24 24
         $acceptedFileTypes = ['image/gif', 'image/png', 'image/jpeg', 'application/pdf', 'application/msword', 'application/excel'];
25
-        $target_dir = __DIR__.'/../documents/';
25
+        $target_dir = __DIR__ . '/../documents/';
26 26
         $this->setUrl($file->getClientFilename());
27 27
         //$fileExtension = pathinfo(basename($file->getName()),PATHINFO_EXTENSION);
28 28
 
29 29
         // Allow certain file formats only
30 30
         if (!in_array($file->getClientMediaType(), $acceptedFileTypes)) {
31
-            throw new InvalidArgumentException('Sorry, only '.implode(', ', $acceptedFileTypes).' files are allowed.');
31
+            throw new InvalidArgumentException('Sorry, only ' . implode(', ', $acceptedFileTypes) . ' files are allowed.');
32 32
         }
33 33
         $this->save();
34
-        $target_file = $target_dir.$this->getId();
34
+        $target_file = $target_dir . $this->getId();
35 35
 
36 36
         // Check if file already exists
37 37
         if (file_exists($target_file)) {
Please login to merge, or discard this patch.