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' => [],

generated-conf/config.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require __DIR__.'/../config/database.php';
+require __DIR__ . '/../config/database.php';
 $serviceContainer = \Propel\Runtime\Propel::getServiceContainer();
 $serviceContainer->checkVersion('2.0.0-dev');
 
@@ -8,7 +8,7 @@ 
 $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle();
 $manager->setConfiguration([
   '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/includes/header.php

Spacing +3 added lines, -3 removed lines

@@ -296,7 +296,7 @@ 
 							<!-- Menu toggle button -->
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 								<i class="fa fa-bell-o"></i>
-								<?php echo $unseen >= 1 ? '<span class="label label-warning">'.$unseen.'</span>' : '' ?>
+								<?php echo $unseen >= 1 ? '<span class="label label-warning">' . $unseen . '</span>' : '' ?>
 							</a>
 							<ul class="dropdown-menu">
 								<li class="header">You have <?php echo $unseen >= 1 ? $unseen : 'no' ?> new notifications</li>
@@ -306,7 +306,7 @@ 
 									<?php foreach ($notifications as $n): ?>
 										<li><!-- start notification -->
 											<a href="notification.php?click=notifications-panel&id=<?php echo $n->id ?>">
-												<i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>'.$n->summary.'</strong>' ?>
+												<i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>' . $n->summary . '</strong>' ?>
 												<small><?php echo timeAgoInWords($n->timestamp) ?></small>
 											</a>
 										</li><!-- end notification -->
@@ -361,7 +361,7 @@ 
 						<!-- User Account Menu -->
 						<li class="dropdown user user-menu">
 							<?php
-                            $sql = 'SELECT u.created FROM users u WHERE id = '.$_SESSION['userid'];
+                            $sql = 'SELECT u.created FROM users u WHERE id = ' . $_SESSION['userid'];
                             $stmt = mysqli_prepare(db(), $sql);
                             mysqli_stmt_bind_param($stmt, 'i', $_SESSION['userid']);
                             mysqli_stmt_execute($stmt) or die(mysqli_error(db()));

public/old/includes/functions.event.php

Spacing +69 added lines, -69 removed lines

@@ -16,7 +16,7 @@ 
     mysqli_stmt_bind_param($stmt, 'ii', $eventId, $userRoleId);
 
     if (!mysqli_stmt_execute($stmt)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     mysqli_stmt_close($stmt);
 }
@@ -35,7 +35,7 @@ 
     mysqli_stmt_bind_param($stmt, 'ii', $id, $userRoleId);
 
     if (!mysqli_stmt_execute($stmt)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     mysqli_stmt_close($stmt);
 }
@@ -185,40 +185,40 @@ 
 
     $verificationCode = verificationCodeForSwap($swapId);
 
-    $subject = 'Swap requested: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n".
-                "Accept:\t\t ".$ob->siteurl.'/swap.php?action='.'accept&swap='.$swapId.'&verify='.$verificationCode."\r\n "."\r\n".
-                "Decline:\t\t ".$ob->siteurl.'/swap.php?action='.'decline&swap='.$swapId.'&verify='.$verificationCode."\r\n "."\r\n";
+    $subject = 'Swap requested: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n" .
+                "Accept:\t\t " . $ob->siteurl . '/swap.php?action=' . 'accept&swap=' . $swapId . '&verify=' . $verificationCode . "\r\n " . "\r\n" .
+                "Decline:\t\t " . $ob->siteurl . '/swap.php?action=' . 'decline&swap=' . $swapId . '&verify=' . $verificationCode . "\r\n " . "\r\n";
 
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user requests swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' requested a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' requested a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user requests swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' requested a swap';
+        $notificationMessage = $ob->newUserFirstName . ' requested a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' requested a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' requested a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' requested a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' requested a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessageOldUser);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessageNewUser);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessageOldUser);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessageNewUser);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     }
@@ -251,60 +251,60 @@ 
 
     $verificationCode = verificationCodeForSwap($swapId);
 
-    $subject = 'Swap accepted: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "The following swap has been accepted\r\n\r\n".
-                "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n";
+    $subject = 'Swap accepted: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "The following swap has been accepted\r\n\r\n" .
+                "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n";
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user accepted swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' accepted a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' accepted a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user accepted swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' accepted a swap';
+        $notificationMessage = $ob->newUserFirstName . ' accepted a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } elseif (isset($_GET['token'])) { // if accepted by email URL with token
         // notify whoever requested swap
         if ($ob->newUserId == $ob->requestedBy) {
-            $notificationMessage = 'Swap accepted with '.$ob->oldUserFirstName;
+            $notificationMessage = 'Swap accepted with ' . $ob->oldUserFirstName;
             $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
             sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         } elseif ($ob->oldUserId == $ob->requestedBy) {
-            $notificationMessage = 'Swap accepted with '.$ob->newUserFirstName;
+            $notificationMessage = 'Swap accepted with ' . $ob->newUserFirstName;
             $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
             sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         } else { // notify both
-            $notificationMessageOldUser = 'Swap accepted with '.$ob->newUserFirstName;
-            $notificationMessageNewUser = 'Swap accepted with '.$ob->oldUserFirstName;
+            $notificationMessageOldUser = 'Swap accepted with ' . $ob->newUserFirstName;
+            $notificationMessageNewUser = 'Swap accepted with ' . $ob->oldUserFirstName;
             $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
             $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+            createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+            createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
             sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
             sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         }
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' accepted a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' accepted a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' accepted a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' accepted a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     }
@@ -336,39 +336,39 @@ 
 
     $verificationCode = verificationCodeForSwap($swapId);
 
-    $subject = 'Swap declined: '.$ob->newUserName.' - '.$ob->eventDate;
-    $message = "The following swap has been declined\r\n\r\n".
-                "Date:\t\t ".strftime($ob->time_format_long, strtotime($ob->eventDate))."\r\n".
-                "Requested by:\t\t ".$ob->requestedBy."\r\n".
-                "Swap from:\t\t ".$ob->oldUserName.' - '.$ob->oldRole."\r\n".
-                "Swap to:\t\t ".$ob->newUserName.' - '.$ob->newRole."\r\n";
+    $subject = 'Swap declined: ' . $ob->newUserName . ' - ' . $ob->eventDate;
+    $message = "The following swap has been declined\r\n\r\n" .
+                "Date:\t\t " . strftime($ob->time_format_long, strtotime($ob->eventDate)) . "\r\n" .
+                "Requested by:\t\t " . $ob->requestedBy . "\r\n" .
+                "Swap from:\t\t " . $ob->oldUserName . ' - ' . $ob->oldRole . "\r\n" .
+                "Swap to:\t\t " . $ob->newUserName . ' - ' . $ob->newRole . "\r\n";
 
     $from = $ob->siteadmin;
 
-    $linkToSwap = 'swap.php?swap='.$swapId;
+    $linkToSwap = 'swap.php?swap=' . $swapId;
 
     $sessionUserId = $_SESSION['userid'];
 
     if ($sessionUserId == $ob->oldUserId) {    // if old user declines swap
         // notify new user
-        $notificationMessage = $ob->oldUserFirstName.' declined a swap';
+        $notificationMessage = $ob->oldUserFirstName . ' declined a swap';
         $notificationId = createNotificationForUser($ob->newUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
     } elseif ($sessionUserId == $ob->newUserId) {    // if new user declines swap
         // notify old user
-        $notificationMessage = $ob->newUserFirstName.' declined a swap';
+        $notificationMessage = $ob->newUserFirstName . ' declined a swap';
         $notificationId = createNotificationForUser($ob->oldUserId, $notificationMessage, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationId, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationId, $notificationMessage);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     } else { // notify both users
         $sessionUserFirstName = getFirstNameWithId($sessionUserId);
-        $notificationMessageOldUser = $sessionUserFirstName.' declined a swap for '.$ob->newUserFirstName;
-        $notificationMessageNewUser = $sessionUserFirstName.' declined a swap for '.$ob->oldUserFirstName;
+        $notificationMessageOldUser = $sessionUserFirstName . ' declined a swap for ' . $ob->newUserFirstName;
+        $notificationMessageNewUser = $sessionUserFirstName . ' declined a swap for ' . $ob->oldUserFirstName;
         $notificationIdOldUser = createNotificationForUser($ob->oldUserId, $notificationMessageOldUser, $message, 'swap', $linkToSwap);
         $notificationIdNewUser = createNotificationForUser($ob->newUserId, $notificationMessageNewUser, $message, 'swap', $linkToSwap);
-        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id='.$notificationIdOldUser, $notificationMessage);
-        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id='.$notificationIdNewUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->oldUserId, 'notification.php?id=' . $notificationIdOldUser, $notificationMessage);
+        createFacebookNotificationForUser($ob->newUserId, 'notification.php?id=' . $notificationIdNewUser, $notificationMessage);
         sendMail(getEmailWithId($ob->newUserId), $subject, $message, $from);
         sendMail(getEmailWithId($ob->oldUserId), $subject, $message, $from);
     }
@@ -543,7 +543,7 @@ 
     $stmt = mysqli_prepare(db(), $sql);
     mysqli_stmt_bind_param($stmt, 'i', $seriesId);
     if (!mysqli_stmt_execute($stmt)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     mysqli_stmt_close($stmt);
 }
@@ -555,14 +555,14 @@ 
     mysqli_stmt_bind_param($stmt, 'ii', $bandId, $userRoleId);
 
     if (!mysqli_stmt_execute($stmt)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     mysqli_stmt_close($stmt);
 }
 
 function getEventUrl($eventId)
 {
-    return 'event.php?id='.$eventId;
+    return 'event.php?id=' . $eventId;
 }
 
 function getEventDetails($eventID, $separator, $type = 4, $apprev_description = true, $prefix = '')
@@ -602,9 +602,9 @@ 
 						e.id = ? ";
 
     if ($type == 1) {
-        $sql = $sql."AND ((g.id in (10,11)) OR (g.id=2 and u.firstname='Team')) ";
+        $sql = $sql . "AND ((g.id in (10,11)) OR (g.id=2 and u.firstname='Team')) ";
     }
-    $sql = $sql.'ORDER BY e.id, g.id desc, role, firstname, lastname ';
+    $sql = $sql . 'ORDER BY e.id, g.id desc, role, firstname, lastname ';
 
     $stmt = mysqli_prepare(db(), $sql);
     mysqli_stmt_bind_param($stmt, 'i', $eventID);
@@ -625,32 +625,32 @@ 
 
         $firstname = $row['firstname'];
         if ($firstname != 'Team') {
-            $firstname = ltrim(substr($firstname, 0, 1).'.', '.');
+            $firstname = ltrim(substr($firstname, 0, 1) . '.', '.');
         }
 
         $lastname = $row['lastname'];
 
-        $returnValue = $returnValue.$separator;
+        $returnValue = $returnValue . $separator;
         switch ($type) {
             case 0:
                 //all persons of event
                 //break;    ->  no special handling, fallthrough to case 1
             case 1:
                 //only persons with groupID in 10,11,2  ->  handled in sql query
-                $returnValue = $returnValue.$prefix.ltrim($group.': ');
-                $returnValue = $returnValue.trim($firstname.' '.$lastname);
+                $returnValue = $returnValue . $prefix . ltrim($group . ': ');
+                $returnValue = $returnValue . trim($firstname . ' ' . $lastname);
                 break;
             case 2:
                 //only event date and event type
-                $returnValue = $returnValue.strftime($time_format_normal, strtotime($eventDate));
-                $returnValue = $returnValue.$separator;
-                $returnValue = $returnValue.$eventType;
+                $returnValue = $returnValue . strftime($time_format_normal, strtotime($eventDate));
+                $returnValue = $returnValue . $separator;
+                $returnValue = $returnValue . $eventType;
 
                 return trim(substr($returnValue, strlen($separator) - 1)); //ends while loop
                 break;
             case 4:
                 //only event type
-                $returnValue = $returnValue.$eventType;
+                $returnValue = $returnValue . $eventType;
 
                 return trim(substr($returnValue, strlen($separator) - 1)); //ends while loop
                 break;

public/old/includes/functions.users.php

Spacing +22 added lines, -22 removed lines

@@ -35,7 +35,7 @@ 
     }
 
     // create username and remove all whitespace
-    $username = $firstNameLower.'.'.$lastNameLower;
+    $username = $firstNameLower . '.' . $lastNameLower;
     $username = preg_replace('/\s+/', '', $username);
 
     $sql = "INSERT INTO users (firstName, lastName, username, email, mobile, password, created, updated)
@@ -48,12 +48,12 @@ 
     $id = mysqli_insert_id(db());
 
     $notificationMessage = "Welcome to your new account on the rota system.\n
-If you have any issues, please get in touch with us [".siteSettings()->getAdminEmailAddress().'](mailto:'.siteSettings()->getAdminEmailAddress().").\n
+If you have any issues, please get in touch with us [".siteSettings()->getAdminEmailAddress() . '](mailto:' . siteSettings()->getAdminEmailAddress() . ").\n
 ---\n
 **Sync to digital calendar**\n
 You may wish to link the rota to your digital calendar on your computer and phone.  To do so, generate a [calendar token](calendarTokens.php) which will present you with your unique URL.  Follow instructions from your digital calendar provider for exact details on how import an iCal feed, or get in touch and we may be able to help.\n";
 
-    createNotificationForUser($id, 'Welcome '.$firstName, $notificationMessage, 'feature');
+    createNotificationForUser($id, 'Welcome ' . $firstName, $notificationMessage, 'feature');
     createNotificationForUser($id, 'Change your password', 'Please change your password to something unique and memorable.', 'account', 'editPassword.php');
 
     return $id;
@@ -97,7 +97,7 @@ 
         "DELETE FROM users WHERE id = ?"
     ];
 
-    foreach($queries as $sql) {
+    foreach ($queries as $sql) {
         $stmt = mysqli_prepare(db(), $sql);
         mysqli_stmt_bind_param($stmt, 'i', $id);
         mysqli_stmt_execute($stmt) or die(mysqli_error(db()));
@@ -123,10 +123,10 @@ 
 function updatePermissions($id, $isAdmin, $isBandAdmin, $isEventEditor, $isOverviewRecipient)
 {
     $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
-    $isAdmin = (bool)$isAdmin;
-    $isOverviewRecipient = (bool)$isOverviewRecipient;
-    $isBandAdmin = (bool)$isBandAdmin;
-    $isEventEditor = (bool)$isEventEditor;
+    $isAdmin = (bool) $isAdmin;
+    $isOverviewRecipient = (bool) $isOverviewRecipient;
+    $isBandAdmin = (bool) $isBandAdmin;
+    $isEventEditor = (bool) $isEventEditor;
 
     $sql = "UPDATE users
             SET isAdmin = ?,
@@ -150,7 +150,7 @@ 
     $result = mysqli_stmt_get_result($stmt);
     $ob = mysqli_fetch_object($result);
     mysqli_stmt_close($stmt);
-    $name = $ob->firstName.' '.$ob->lastName;
+    $name = $ob->firstName . ' ' . $ob->lastName;
 
     return $name;
 }
@@ -242,7 +242,7 @@ 
     mysqli_stmt_bind_param($stmt, 'ssi', $hashedPassword, $currentTimestamp, $userId);
     mysqli_stmt_execute($stmt) or die(mysqli_error(db()));
     mysqli_stmt_close($stmt);
-    insertStatistics('user', __FILE__, 'password force changed for user '.getNameWithId($userId), null, $_SERVER['HTTP_USER_AGENT']);
+    insertStatistics('user', __FILE__, 'password force changed for user ' . getNameWithId($userId), null, $_SERVER['HTTP_USER_AGENT']);
 }
 
 function hashPassword($plainTextPassword)
@@ -288,7 +288,7 @@ 
     if ($loginFailures < $numberOfAllowedAttempts) {
         return true;
     } else {
-        insertStatistics('user', __FILE__, 'Login attempts exceeded for username: '.$username, $ipAddress, $_SERVER['HTTP_USER_AGENT']);
+        insertStatistics('user', __FILE__, 'Login attempts exceeded for username: ' . $username, $ipAddress, $_SERVER['HTTP_USER_AGENT']);
 
         return false;
     }
@@ -376,11 +376,11 @@ 
     $pendingId = mysqli_insert_id(db());
     mysqli_stmt_close($stmt);
 
-    $linkToApprove = 'pendingAccounts.php?id='.$pendingId;
+    $linkToApprove = 'pendingAccounts.php?id=' . $pendingId;
 
-    $email = siteSettings()->getOwner().'<'.siteSettings()->getAdminEmailAddress().'>';
-    $subject = $firstName.' requested an account';
-    $message = $subject.' through '.$source.".\nApprove or decline: ".siteSettings()->getSiteUrl().'/'.$linkToApprove;
+    $email = siteSettings()->getOwner() . '<' . siteSettings()->getAdminEmailAddress() . '>';
+    $subject = $firstName . ' requested an account';
+    $message = $subject . ' through ' . $source . ".\nApprove or decline: " . siteSettings()->getSiteUrl() . '/' . $linkToApprove;
 
     sendMail($email, $subject, $message, $email);
 
@@ -472,7 +472,7 @@ 
     addSocialAuthToUserWithId($userId, $pendingUser->socialId, $pendingUser->source);
     updateUser($userId, $pendingUser->firstName, $pendingUser->lastName, $pendingUser->email, null);
 
-    createNotificationForUser($userId, 'Social Login added: '.$pendingUser->source, 'Your social media login details for '.$pendingUser->source.' have been added to your existing account', 'account');
+    createNotificationForUser($userId, 'Social Login added: ' . $pendingUser->source, 'Your social media login details for ' . $pendingUser->source . ' have been added to your existing account', 'account');
     createFacebookNotificationForUser($userId, 'login.php', 'Your account request has been approved. You can now login via Facebook.');
 
     return true;
@@ -587,25 +587,25 @@ 
     if ($user->socialId) {
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//graph.facebook.com/'.$user->socialId.'/picture?type=square';
+                return '//graph.facebook.com/' . $user->socialId . '/picture?type=square';
                 break;
             case 'large': // 200px x 200px
-                return '//graph.facebook.com/'.$user->socialId.'/picture?type=large';
+                return '//graph.facebook.com/' . $user->socialId . '/picture?type=large';
                 break;
             default:
-                return '//graph.facebook.com/'.$user->socialId.'/picture';
+                return '//graph.facebook.com/' . $user->socialId . '/picture';
                 break;
         }
     } else {
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=50&d=mm';
                 break;
             case 'large': // 200px x 200px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=200&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=200&d=mm';
                 break;
             default:
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=50&d=mm';
                 break;
         }
     }

public/old/includes/functions.auth.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
         $_SESSION['db_is_logged_in'] = true;
         $_SESSION['isAdmin'] = $row['isAdmin']; // Set the admin status to be carried across this session
         $_SESSION['userid'] = $row['id'];
-        $_SESSION['name'] = $row['firstName'].' '.$row['lastName'];
+        $_SESSION['name'] = $row['firstName'] . ' ' . $row['lastName'];
         $_SESSION['isBandAdmin'] = $row['isBandAdmin']; // Set the band admin status to be carried across this session
         $_SESSION['isEventEditor'] = $row['isEventEditor']; // Set the event editor status to be carried across this session
         $_SESSION['onlyShowUserEvents'] = $users_start_with_myevents; // 1 if users_start_with_myevents is set in settings, can be changed by user during session
@@ -33,7 +33,7 @@ 
 
         // admin section
         if ($_SESSION['isAdmin'] == 1) {
-            updateDatabase();                        //check for db updates
+            updateDatabase(); //check for db updates
             //$_SESSION['onlyShowUserEvents'] = '0';		//show all events for admin, regardless what settings say
         }
 
@@ -51,11 +51,11 @@ 
             $redirectFromSession = strip_tags($_SESSION['redirectUrl']);
             unset($_SESSION['redirectUrl']);
             // check is url is on same domain and prevents redirecting to logout page
-            if (strncmp(strtolower(siteSettings()->getSiteUrl().'/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) {
+            if (strncmp(strtolower(siteSettings()->getSiteUrl() . '/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) {
                 $redirectUrl = $redirectFromSession;
             }
         }
-        header('Location: '.$redirectUrl);
+        header('Location: ' . $redirectUrl);
         exit;
     }
 }

public/old/locations.php

Spacing +3 added lines, -3 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;
 }
 
@@ -97,8 +97,8 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $locationID = $row['id'];
-        echo "<span id='".$locationID."' class='edit'>".$row['name'].'</span> ';
-        echo " <a href='locations.php?locationremove=true&locationID=".$locationID."'><i class='fa fa-close'></i></a><br />";
+        echo "<span id='" . $locationID . "' class='edit'>" . $row['name'] . '</span> ';
+        echo " <a href='locations.php?locationremove=true&locationID=" . $locationID . "'><i class='fa fa-close'></i></a><br />";
     } ?>
  </div><!-- /.box-body -->
 </div><!-- /.box -->