TechWilk / rota

src/routes.php

Spacing +65 added lines, -65 removed lines

@@ -22,35 +22,35 @@ 
 // USER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/user', function () {
-    $this->get('s', UserController::class.':getAllUsers')->setName('users');
+$app->group('/user', function() {
+    $this->get('s', UserController::class . ':getAllUsers')->setName('users');
 
-    $this->get('/{id}/widget-only', UserController::class.':getUserWidgetOnly')->setName('user-widget-only');
+    $this->get('/{id}/widget-only', UserController::class . ':getUserWidgetOnly')->setName('user-widget-only');
 
-    $this->get('/new', UserController::class.':getNewUserForm')->setName('user-new');
-    $this->get('/{id}/edit', UserController::class.':getUserEditForm')->setName('user-edit');
-    $this->get('/{id}/password', UserController::class.':getUserPasswordForm')->setName('user-password');
+    $this->get('/new', UserController::class . ':getNewUserForm')->setName('user-new');
+    $this->get('/{id}/edit', UserController::class . ':getUserEditForm')->setName('user-edit');
+    $this->get('/{id}/password', UserController::class . ':getUserPasswordForm')->setName('user-password');
 
-    $this->get('/me', UserController::class.':getCurrentUser')->setName('user-me');
-    $this->get('/{id}', UserController::class.':getUser')->setName('user');
+    $this->get('/me', UserController::class . ':getCurrentUser')->setName('user-me');
+    $this->get('/{id}', UserController::class . ':getUser')->setName('user');
 
-    $this->post('[/{id}]', UserController::class.':postUser')->setName('user-post');
-    $this->post('/{id}/password', UserController::class.':postUserPasswordChange')->setName('user-password-post');
+    $this->post('[/{id}]', UserController::class . ':postUser')->setName('user-post');
+    $this->post('/{id}/password', UserController::class . ':postUserPasswordChange')->setName('user-password-post');
 
     // roles
-    $this->get('/{id}/roles', RoleController::class.':getAssignRolesForm')->setName('user-roles');
-    $this->post('/{id}/roles', RoleController::class.':postUserAssignRoles')->setName('user-assign-post');
+    $this->get('/{id}/roles', RoleController::class . ':getAssignRolesForm')->setName('user-roles');
+    $this->post('/{id}/roles', RoleController::class . ':postUserAssignRoles')->setName('user-assign-post');
 
     // availability
-    $this->get('/{id}/availability', AvailabilityController::class.':getAvailabilityForm')->setName('user-availability');
-    $this->post('/{id}/availability', AvailabilityController::class.':postAvailability')->setName('user-availability-post');
+    $this->get('/{id}/availability', AvailabilityController::class . ':getAvailabilityForm')->setName('user-availability');
+    $this->post('/{id}/availability', AvailabilityController::class . ':postAvailability')->setName('user-availability-post');
 
     // calendar
-    $this->group('/me/calendar', function () {
-        $this->get('s', CalendarController::class.':getCalendarTokens')->setName('user-calendars');
-        $this->get('/new', CalendarController::class.':getNewCalendarForm')->setName('user-calendars');
-        $this->get('/{id}/revoke', CalendarController::class.':getRevokeCalendar')->setName('user-calendar-revoke');
-        $this->post('/new', CalendarController::class.':postNewCalendar')->setName('user-calendar-new-post');
+    $this->group('/me/calendar', function() {
+        $this->get('s', CalendarController::class . ':getCalendarTokens')->setName('user-calendars');
+        $this->get('/new', CalendarController::class . ':getNewCalendarForm')->setName('user-calendars');
+        $this->get('/{id}/revoke', CalendarController::class . ':getRevokeCalendar')->setName('user-calendar-revoke');
+        $this->post('/new', CalendarController::class . ':postNewCalendar')->setName('user-calendar-new-post');
     });
 });
 
@@ -58,103 +58,103 @@ 
 // EVENT
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/event', function () {
-    $this->get('s', EventController::class.':getAllEvents')->setName('events');
-    $this->get('s/type/{id}', EventController::class.':getAllEventsWithType')->setName('events-eventtype');
-    $this->get('s/subtype/{id}', EventController::class.':getAllEventsWithSubType')->setName('events-eventsubtype');
+$app->group('/event', function() {
+    $this->get('s', EventController::class . ':getAllEvents')->setName('events');
+    $this->get('s/type/{id}', EventController::class . ':getAllEventsWithType')->setName('events-eventtype');
+    $this->get('s/subtype/{id}', EventController::class . ':getAllEventsWithSubType')->setName('events-eventsubtype');
 
-    $this->get('s/print/info', EventController::class.':getAllEventInfoToPrint')->setName('events-print-info');
+    $this->get('s/print/info', EventController::class . ':getAllEventInfoToPrint')->setName('events-print-info');
 
-    $this->get('/new', EventController::class.':getNewEventForm')->setName('event-new');
-    $this->get('/{id}/edit', EventController::class.':getEventEditForm')->setName('event-edit');
-    $this->get('/{id}/copy', EventController::class.':getEventCopyForm')->setName('event-copy');
-    $this->get('/{id}/assign', EventController::class.':getEventAssignForm')->setName('event-assign');
+    $this->get('/new', EventController::class . ':getNewEventForm')->setName('event-new');
+    $this->get('/{id}/edit', EventController::class . ':getEventEditForm')->setName('event-edit');
+    $this->get('/{id}/copy', EventController::class . ':getEventCopyForm')->setName('event-copy');
+    $this->get('/{id}/assign', EventController::class . ':getEventAssignForm')->setName('event-assign');
 
-    $this->get('/{id}', EventController::class.':getEvent')->setName('event');
+    $this->get('/{id}', EventController::class . ':getEvent')->setName('event');
 
-    $this->post('[/{id}]', EventController::class.':postEvent')->setName('event-post');
-    $this->post('/{id}/assign', EventController::class.':postEventAssign')->setName('event-assign-post');
-    $this->post('/{id}/comment', EventController::class.':postEventComment')->setName('event-comment-post');
+    $this->post('[/{id}]', EventController::class . ':postEvent')->setName('event-post');
+    $this->post('/{id}/assign', EventController::class . ':postEventAssign')->setName('event-assign-post');
+    $this->post('/{id}/comment', EventController::class . ':postEventComment')->setName('event-comment-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // RESOURCE
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/resource', function () {
-    $this->get('s', ResourceController::class.':getAllResources')->setName('resources');
+$app->group('/resource', function() {
+    $this->get('s', ResourceController::class . ':getAllResources')->setName('resources');
 
-    $this->get('[/new]', ResourceController::class.':getNewResourceForm')->setName('resource-new');
-    $this->get('/{id}/edit', ResourceController::class.':getResourceEditForm')->setName('resource-edit');
+    $this->get('[/new]', ResourceController::class . ':getNewResourceForm')->setName('resource-new');
+    $this->get('/{id}/edit', ResourceController::class . ':getResourceEditForm')->setName('resource-edit');
 
-    $this->get('/{id}', ResourceController::class.':getResourceFile')->setName('resource');
+    $this->get('/{id}', ResourceController::class . ':getResourceFile')->setName('resource');
 
-    $this->post('[/{id}]', ResourceController::class.':postResource')->setName('resource-post');
+    $this->post('[/{id}]', ResourceController::class . ':postResource')->setName('resource-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // ROLES & GROUPS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/group', function () {
-    $this->get('/{id}', GroupController::class.':getGroup')->setName('group');
-    $this->get('/{id}/roles', GroupController::class.':getGroupRoles')->setName('group-roles');
+$app->group('/group', function() {
+    $this->get('/{id}', GroupController::class . ':getGroup')->setName('group');
+    $this->get('/{id}/roles', GroupController::class . ':getGroupRoles')->setName('group-roles');
 
-    $this->get('/{id}/events', EventController::class.':getAllEventsToPrintForGroup')->setName('group-events-print');
+    $this->get('/{id}/events', EventController::class . ':getAllEventsToPrintForGroup')->setName('group-events-print');
 
-    $this->post('[/{id}]', GroupController::class.':postGroup')->setName('group-post');
+    $this->post('[/{id}]', GroupController::class . ':postGroup')->setName('group-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // AUTH
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/login', AuthController::class.':getLoginForm')->setName('login');
+$app->get('/login', AuthController::class . ':getLoginForm')->setName('login');
 
-$app->get('/login/{provider}', AuthController::class.':getLoginAuth')->setName('login-auth');
-$app->get('/login/{provider}/callback', AuthController::class.':getLoginCallback')->setName('login-callback');
-$app->get('/signup', PendingUserController::class.':getSignUpForm')->setName('sign-up');
-$app->get('/signup/cancel', PendingUserController::class.':getSignUpCancel')->setName('sign-up-cancel');
+$app->get('/login/{provider}', AuthController::class . ':getLoginAuth')->setName('login-auth');
+$app->get('/login/{provider}/callback', AuthController::class . ':getLoginCallback')->setName('login-callback');
+$app->get('/signup', PendingUserController::class . ':getSignUpForm')->setName('sign-up');
+$app->get('/signup/cancel', PendingUserController::class . ':getSignUpCancel')->setName('sign-up-cancel');
 
-$app->get('/logout', AuthController::class.':getLogout')->setName('logout');
+$app->get('/logout', AuthController::class . ':getLogout')->setName('logout');
 
-$app->post('/login', AuthController::class.':postLogin')->setName('login-post');
-$app->post('/signup', PendingUserController::class.':postSignUp')->setName('sign-up-post');
+$app->post('/login', AuthController::class . ':postLogin')->setName('login-post');
+$app->post('/signup', PendingUserController::class . ':postSignUp')->setName('sign-up-post');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // NOTIFICATIONS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/notification/{id}[/{referrer}]', NotificationController::class.':getNotificationClick')->setName('notification');
+$app->get('/notification/{id}[/{referrer}]', NotificationController::class . ':getNotificationClick')->setName('notification');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // CALENDAR
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/calendar/{token}.{format}', CalendarController::class.':getRenderedCalendar')->setName('user-calendar');
+$app->get('/calendar/{token}.{format}', CalendarController::class . ':getRenderedCalendar')->setName('user-calendar');
 
 // legacy
-$app->get('/calendar.php', CalendarController::class.':getLegacyRenderedCalendar')->setName('user-calendar');
+$app->get('/calendar.php', CalendarController::class . ':getLegacyRenderedCalendar')->setName('user-calendar');
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // OTHER
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->get('/settings', function ($request, $response, $args) {
+$app->get('/settings', function($request, $response, $args) {
     // Sample log message
     $this->logger->info("Fetch settings GET '/settings'");
 
-    $url = $this->router->pathFor('home').'old/settings.php';
+    $url = $this->router->pathFor('home') . 'old/settings.php';
 
     return $response->withStatus(303)->withHeader('Location', $url);
     //return $this->view->render($response, 'settings.twig', []);
 })->setName('settings');
 
-$app->get('/token', function ($request, $response, $args) {
+$app->get('/token', function($request, $response, $args) {
     return $response->getBody()->write(Crypt::generateToken(30));
 })->setName('token');
 
-$app->get('/', function ($request, $response, $args) {
+$app->get('/', function($request, $response, $args) {
     // Sample log message
     $this->logger->info("Fetch home GET '/'");
 
@@ -174,19 +174,19 @@ 
 // INSTALL
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/install', function () {
-    $this->get('', InstallController::class.':getInstall')->setName('install');
+$app->group('/install', function() {
+    $this->get('', InstallController::class . ':getInstall')->setName('install');
 
-    $this->get('/database', InstallController::class.':getInstallDatabase')->setName('install-database');
+    $this->get('/database', InstallController::class . ':getInstallDatabase')->setName('install-database');
 
-    $this->get('/user', InstallController::class.':getFirstUserForm')->setName('install-user');
-    $this->post('/user', InstallController::class.':postFirstUserForm')->setName('install-user-post');
+    $this->get('/user', InstallController::class . ':getFirstUserForm')->setName('install-user');
+    $this->post('/user', InstallController::class . ':postFirstUserForm')->setName('install-user-post');
 });
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // JOBS
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-$app->group('/job', function () {
-    $this->get('/daily/{token}', JobController::class.':getDaily')->setName('job-daily');
+$app->group('/job', function() {
+    $this->get('/daily/{token}', JobController::class . ':getDaily')->setName('job-daily');
 });

src/classes/Controller/InstallController.php

Spacing +12 added lines, -12 removed lines

@@ -24,12 +24,12 @@ 
 
         $stage = 1;
 
-        $configPath = __DIR__.'/../../../config';
+        $configPath = __DIR__ . '/../../../config';
         if (
-            file_exists($configPath.'/auth.php')
-            && file_exists($configPath.'/database.php')
-            && file_exists($configPath.'/email.php')
-            && file_exists($configPath.'/recording.php')
+            file_exists($configPath . '/auth.php')
+            && file_exists($configPath . '/database.php')
+            && file_exists($configPath . '/email.php')
+            && file_exists($configPath . '/recording.php')
         ) {
             $stage = 2;
         }
@@ -77,17 +77,17 @@ 
             'command'      => 'sql:build',
             '-vvv'         => true,
             '--overwrite'  => true,
-            '--config-dir' => __DIR__.'/../../../generated-conf',
-            '--schema-dir' => __DIR__.'/../../../',
-            '--output-dir' => __DIR__.'/../../../build/sql',
+            '--config-dir' => __DIR__ . '/../../../generated-conf',
+            '--schema-dir' => __DIR__ . '/../../../',
+            '--output-dir' => __DIR__ . '/../../../build/sql',
         ]);
         $propelGenerator->run($input, $output);
 
         $input = new ArrayInput([
             'command'      => 'sql:insert',
             '-vvv'         => true,
-            '--config-dir' => __DIR__.'/../../../generated-conf',
-            '--sql-dir'    => __DIR__.'/../../../build/sql',
+            '--config-dir' => __DIR__ . '/../../../generated-conf',
+            '--sql-dir'    => __DIR__ . '/../../../build/sql',
         ]);
         $propelGenerator->run($input, $output);
 
@@ -99,7 +99,7 @@ 
             $existingUserCount = UserQuery::create()->count();
         } catch (\Propel\Runtime\Exception\PropelException $e) {
             if ($e->getPrevious()->getCode() === '42S02') {
-                return $response->getBody()->write('Error installing database:'."\n".$outputString);
+                return $response->getBody()->write('Error installing database:' . "\n" . $outputString);
             }
         }
 
@@ -152,7 +152,7 @@ 
 
         return $this->view->render($response, 'login-credentials.twig', [
             'username' => $user->getEmail(),
-            'message'  => 'Your password is: '.$password.' Copy it somewhere safe as it will not be displayed again. You can change it once you\'ve logged in.',
+            'message'  => 'Your password is: ' . $password . ' Copy it somewhere safe as it will not be displayed again. You can change it once you\'ve logged in.',
         ]);
     }
 

generated-conf/propel.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require __DIR__.'/../config/database.php';
+require __DIR__ . '/../config/database.php';
 
 return [
     'propel' => [
@@ -9,7 +9,7 @@ 
                 'default' => [
                     'adapter'    => 'mysql',
                     'classname'  => 'Propel\Runtime\Connection\ConnectionWrapper',
-                    'dsn'        => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'],
+                    'dsn'        => 'mysql:host=' . $config['db']['host'] . ';dbname=' . $config['db']['dbname'],
                     'user'       => $config['db']['user'],
                     'password'   => $config['db']['pass'],
                     'attributes' => [],

public/old/series.php

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -42,7 +42,7 @@ 
             $sql = "UPDATE eventGroups SET name = '$name', description = '$description' WHERE id = '$editid'";
         }
         if (!mysqli_query(db(), $sql)) {
-            exit('Error: '.mysqli_error(db()));
+            exit('Error: ' . mysqli_error(db()));
         }
     } else {
         $name = $_POST['seriesName'];
@@ -56,7 +56,7 @@ 
         } else {
             $sql = ("INSERT INTO eventGroups (name, description) VALUES ('$name', '$description')");
             if (!mysqli_query(db(), $sql)) {
-                exit('Error: '.mysqli_error(db()));
+                exit('Error: ' . mysqli_error(db()));
             }
 
             // After we have inserted the data, we want to head back to the main users page
@@ -99,9 +99,9 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $seriesId = $row['id'];
-        echo "<span id='".$seriesId."' class='edit'><strong>".$row['name'].'</strong></span>';
-        echo " <a href='series.php?method=remove&series=".$seriesId."'><i class='fa fa-close'></i></a><br />";
-        echo "<p id='".$seriesId."' class='edit'>".$row['description'].'</p>';
+        echo "<span id='" . $seriesId . "' class='edit'><strong>" . $row['name'] . '</strong></span>';
+        echo " <a href='series.php?method=remove&series=" . $seriesId . "'><i class='fa fa-close'></i></a><br />";
+        echo "<p id='" . $seriesId . "' class='edit'>" . $row['description'] . '</p>';
         echo '<hr />';
     } ?>
  </div><!-- /.box-body -->

public/old/swap.php

Spacing +7 added lines, -7 removed lines

@@ -112,7 +112,7 @@ 
 if (!empty($eventId)) {
     // ensure user is logged in before allowing creation of swap
     if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId;
+        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId;
         header('Location: login.php');
     }
     $createSwap = true;
@@ -188,11 +188,11 @@ 
             <p>
               <strong>
                 <s class="text-red">
-                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                 </s>
                 &#8594;
                 <span class="text-green">
-                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                 </span>
               </strong>
             </p>
@@ -227,16 +227,16 @@ 
                 <select name="newUserRole" class="form-control">
                   <?php
                   if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                      $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE';
                   } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
+                      $whereAnd = 'r.id = ' . $role->roleId;
                   }
-                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
+                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> ' . $role->userId . ' AND ' . $whereAnd . ' ORDER BY lastName, firstName, r.name';
                   $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
                   while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                       ?>
-                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
+                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option>
                   <?php
                   } ?>
                 </select>

public/old/index.php

Spacing +12 added lines, -12 removed lines

@@ -223,7 +223,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName().': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '('.$event->getBibleVerse().')' : '' ?></p>
+              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName() . ': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '(' . $event->getBibleVerse() . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->getLocation()->getName(); ?></p>
 
               <?php if ($event->getComments()) { ?>
@@ -283,7 +283,7 @@ 
                                   INNER JOIN groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->getId()."'
+                                WHERE ep.eventId = '".$event->getId() . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -307,16 +307,16 @@ 
                               } else {
                                   echo '</ul>';
                               }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
+                              echo '<p><strong>' . $groupName . '</strong></p>';
                               echo '<ul>';
                           }
 
                           echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                           echo $viewPeople->name;
 
                           if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
+                              echo ' - <em>' . $viewPeople->rolename . '</em>';
                           } else {
                               // If there is no skill, we don't need to mention this.
                           }
@@ -398,7 +398,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->eventGroup ? $event->eventGroup.': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '('.$event->bibleVerse.')' : '' ?></p>
+              <p><strong><?php echo $event->eventGroup ? $event->eventGroup . ': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '(' . $event->bibleVerse . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->eventLocation; ?></p>
 
               <?php if ($event->comment != '') { ?>
@@ -459,7 +459,7 @@ 
                                   INNER JOIN groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->id."'
+                                WHERE ep.eventId = '".$event->id . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -483,16 +483,16 @@ 
                               } else {
                                   echo '</ul>';
                               }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
+                              echo '<p><strong>' . $groupName . '</strong></p>';
                               echo '<ul>';
                           }
 
                           echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                           echo $viewPeople->name;
 
                           if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
+                              echo ' - <em>' . $viewPeople->rolename . '</em>';
                           } else {
                               // If there is no skill, we don't need to mention this.
                           }
@@ -628,7 +628,7 @@ 
             <img class="img-circle" src="<?php echo getProfileImageUrl($_SESSION['userid'], 'large') ?>" alt="User Avatar">
           </div>
           <!-- /.widget-user-image -->
-          <h3 class="widget-user-username"><?php echo $user->getFirstName().' '.$user->getLastName() ?></h3>
+          <h3 class="widget-user-username"><?php echo $user->getFirstName() . ' ' . $user->getLastName() ?></h3>
           <h5 class="widget-user-desc">Account created <?php echo $user->getCreated('M. Y') ?></h5>
         </div>
         <div class="box-footer no-padding">
@@ -652,7 +652,7 @@ 
                 $userHasEmail = (strlen($user->getEmail()) > 3);
                 $emailRemindersEnabled = ($userHasEmail && true); // todo: add opt-out for email reminders
                 ?>
-                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>
+                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>
               </a>
             </li>
             <li>

public/old/subTypes.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -39,7 +39,7 @@ 
 
         $sql = ("INSERT INTO eventSubTypes (name, description) VALUES ('$name', '$description')");
         if (!mysqli_query(db(), $sql)) {
-            exit('Error: '.mysqli_error(db()));
+            exit('Error: ' . mysqli_error(db()));
         }
     } else {
         // Otherwise we are dealing with edits, not new stuff
@@ -90,10 +90,10 @@ 
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-        echo '<input type="hidden" name="formindex[]" value="'.$row['id'].'" />';
-        echo "<input name='name[]' value='".$row['name']."' />";
+        echo '<input type="hidden" name="formindex[]" value="' . $row['id'] . '" />';
+        echo "<input name='name[]' value='" . $row['name'] . "' />";
 
-        echo " <a href='subTypes.php?method=remove&subType=".$row['id']."'><i class='fa fa-times'></i></a><br />";
+        echo " <a href='subTypes.php?method=remove&subType=" . $row['id'] . "'><i class='fa fa-times'></i></a><br />";
     } ?>
    </div><!-- /.box-body -->
    <div class="box-footer">

public/old/settings.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -167,7 +167,7 @@ 
 		skin='$skin'";
 
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('Error: ' . mysqli_error(db()));
     }
     header('Location: settings.php');
 }
@@ -194,7 +194,7 @@ 
 	<!-- Content Header (Page header) -->
 	<section class="content-header">
 		<h1>Settings
-			<?php echo '<small>v'.$row['version'].'</small>'; ?>
+			<?php echo '<small>v' . $row['version'] . '</small>'; ?>
 		</h1>
 		<ol class="breadcrumb">
 			<li><a href="<?php echo siteSettings()->getSiteUrl() ?>"><i class="fa fa-dashboard"></i> Home</a></li>

public/old/pendingAccounts.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -33,14 +33,14 @@ 
     case 'approve':
       $userId = approvePendingUser($id);
       mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
+      header('Location: addUser.php?action=edit&user=' . $userId);
       break;
     case 'merge':
       $existingUserId = $_POST['existingUser'];
       $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
       mergePendingUserWithUserId($id, $existingUserId);
       mailNewUser($existingUserId);
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
+      header('Location: addUser.php?action=edit&user=' . $existingUserId);
       break;
     case 'decline':
       declinePendingUser($id);
@@ -92,7 +92,7 @@ 
 <div class="box box-primary">
   <div class="box-header">
     <h2 class="box-title">
-      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?>
+      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?>
     </h2>
   </div>
   <div class="box-body">
@@ -133,7 +133,7 @@ 
             <?php
             $users = allUsersNames();
             foreach ($users as $existingUser) { ?>
-            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option>
+            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option>
             <?php } ?>
           </select>
         </div>