TechWilk / rota

public/old/includes/config.php

Spacing +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@ 
 
 namespace TechWilk\Rota;
 
-include __DIR__.'/../../../config/database.php';
-include __DIR__.'/../../../config/auth.php';
-include __DIR__.'/../../../config/email.php';
-include __DIR__.'/../../../config/recording.php';
+include __DIR__ . '/../../../config/database.php';
+include __DIR__ . '/../../../config/auth.php';
+include __DIR__ . '/../../../config/email.php';
+include __DIR__ . '/../../../config/recording.php';
 
 // -- Setup database --
 
@@ -17,10 +17,10 @@ 
 }
 
 // Connect to the database server
-$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or exit('Connection to '.$config['db']['host']." with login '".$config['db']['user']."'/'$pwdMasked' failed.");
+$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or exit('Connection to ' . $config['db']['host'] . " with login '" . $config['db']['user'] . "'/'$pwdMasked' failed.");
 
 // Choose the right database
-$db = @mysqli_select_db($dbh, $config['db']['dbname']) or exit("Connection made, but database '".$config['db']['dbname']."' was not found.");
+$db = @mysqli_select_db($dbh, $config['db']['dbname']) or exit("Connection made, but database '" . $config['db']['dbname'] . "' was not found.");
 
 // allow config to be fetched in functions
 

public/api/v1/index.php

Spacing +4 added lines, -4 removed lines

@@ -23,9 +23,9 @@ 
     // Start of API
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    require_once __DIR__.'/../../../vendor/autoload.php';
+    require_once __DIR__ . '/../../../vendor/autoload.php';
 
-    require_once __DIR__.'/../../../generated-conf/config.php';
+    require_once __DIR__ . '/../../../generated-conf/config.php';
 
     // Create and configure Slim app
     $app = new \Slim\App(['settings' => $config]);
@@ -36,7 +36,7 @@ 
 
     $container = $app->getContainer();
 
-    $container['db'] = function ($c) {
+    $container['db'] = function($c) {
         $db_config = $c['settings']['db'];
         $db = new Database($db_config);
 
@@ -49,7 +49,7 @@ 
 
     // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
 
-    $app->post('/series', function ($request, $response, $args) {
+    $app->post('/series', function($request, $response, $args) {
         $postData = $request->getParsedBody();
 
         $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);

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/locations.php

Indentation +3 added lines, -3 removed lines

@@ -142,10 +142,10 @@
 	</form>
 </div><!-- /.box -->
   <?php
-  if (isAdmin()) {
-      ?>
+    if (isAdmin()) {
+        ?>
   <div id="right">
   		<div class="item"><a href="settings.php">Back to settings</a></div>
 <?php
-  } ?>
+    } ?>
 <?php include 'includes/footer.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 -->

generated-classes/TechWilk/Rota/User.php

Spacing +13 added lines, -13 removed lines

@@ -114,7 +114,7 @@ 
      */
     public function getName()
     {
-        return $this->firstname.' '.$this->lastname;
+        return $this->firstname . ' ' . $this->lastname;
     }
 
     /**
@@ -133,16 +133,16 @@ 
                 if ($socialAuth->getPlatform() == 'facebook') {
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square';
                             break;
                         case 'medium': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         case 'large': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         default:
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture';
                             break;
                     }
                 } elseif ($socialAuth->getPlatform() == 'onebody') {
@@ -155,16 +155,16 @@ 
                     $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION);
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'medium': // 150px x 150px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'large': // 500px x 500px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension;
                             break;
                         default:
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                             break;
                     }
                 }
@@ -173,16 +173,16 @@ 
 
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
                 break;
             case 'medium': // 200px x 200px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm';
                 break;
             case 'large': // 500px x 500px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm';
                 break;
             default:
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
                 break;
         }
     }

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)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('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)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('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)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('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)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('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 = '')
@@ -601,9 +601,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);
@@ -624,32 +624,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 +17 added lines, -17 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;
@@ -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 exit(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.database.php

Spacing +28 added lines, -28 removed lines

@@ -24,14 +24,14 @@ 
 function executeDbSql($sql)
 {
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()).', SQL: '.$sql);
+        exit('Error: ' . mysqli_error(db()) . ', SQL: ' . $sql);
     }
 }
 
 function updateDatabase()
 {
     $sql = 'SELECT VERSION( ) AS mysqli_version';
-    $result = mysqli_query(db(), $sql) or exit('MySQL-Error: '.mysqli_error(db()));
+    $result = mysqli_query(db(), $sql) or exit('MySQL-Error: ' . mysqli_error(db()));
     $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
     $mysqli_version = $dbv['mysqli_version'];
     //echo $mysqli_version."<br>";
@@ -85,41 +85,41 @@ 
             executeDbSql("alter table users add(isOverviewRecipient char(2) NOT NULL DEFAULT '0')");
             executeDbSql('alter table groups add(short_name char(2))');
 
-            executeDbSql("update settings set lang_locale = 'en_GB'");                     // de_DE
+            executeDbSql("update settings set lang_locale = 'en_GB'"); // de_DE
             executeDbSql('update settings set event_sorting_latest = 0');
             executeDbSql('update settings set snapshot_show_two_month = 0');
             executeDbSql('update settings set snapshot_reduce_skills_by_group = 0');
             executeDbSql('update settings set logged_in_show_snapshot_button = 0');
             executeDbSql("update settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update settings set version = '2.1.0'");
             executeDbSql('update settings set users_start_with_myevents = 0');
             executeDbSql("update settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
             executeDbSql("update settings set google_group_calendar = ''");
             executeDbSql("update settings set overviewemail = 'Hello,\r\n\r\nIn this email you find the Rota for [MONTH] [YEAR].\r\n\r\n[OVERVIEW]\r\n\r\nPlease inform us as soon as possible, if you are not able to serve as scheduled.\r\n\r\nBe blessed.\r\nChurch Support Stuff'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.0', $_SESSION['userid']);
         case '2.1.0':
             executeDbSql('create table settings_bkp2_1_0 as select * from settings');
             executeDbSql('alter table settings add(group_sorting_name int(1))');
             executeDbSql("update settings set version = '2.1.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.1', $_SESSION['userid']);
         case '2.1.1':
             executeDbSql("update settings set version = '2.1.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.2', $_SESSION['userid']);
         case '2.1.2':
             executeDbSql("alter table settings add(debug_mode int(1) DEFAULT '0')");
-            executeDbSql('update settings set group_sorting_name = 0');  //was a workaround, fixed in V2.2.1
+            executeDbSql('update settings set group_sorting_name = 0'); //was a workaround, fixed in V2.2.1
 
             executeDbSql("update settings set version = '2.2.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.0', $_SESSION['userid']);
         case '2.2.0':
             executeDbSql("alter table users add(isBandAdmin char(2) NOT NULL DEFAULT '0')");
             executeDbSql('update settings set group_sorting_name = 0'); //due to an error reset it again
 
             executeDbSql("update settings set version = '2.2.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.1', $_SESSION['userid']);
         case '2.2.1':
             $sql = "CREATE TABLE IF NOT EXISTS `statistics` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -135,21 +135,21 @@ 
             executeDbSql($sql);
 
             executeDbSql("update settings set version = '2.3.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.0', $version);
         case '2.3.0':
             executeDbSql("alter table users add(isEventEditor char(2) NOT NULL DEFAULT '0')");
 
             executeDbSql("update settings set version = '2.3.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.1', $version);
         case '2.3.1':
             executeDbSql("update settings set version = '2.3.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.2', $version);
         case '2.3.2':
             executeDbSql("update settings set version = '2.3.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.3', $version);
         case '2.3.3':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -198,33 +198,33 @@ 
                 );
             }
             executeDbSql("update settings set version = '2.3.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.4', $version);
         case '2.3.4':
             executeDbSql("update settings set version = '2.3.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.5', $version);
         case '2.3.5':
             executeDbSql("update settings set version = '2.4.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.0', $version);
         case '2.4.0':
             executeDbSql("update settings set version = '2.4.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.1', $version);
         case '2.4.1':
             executeDbSql('alter table settings add(days_to_alert int(2) DEFAULT 5) ');
             executeDbSql("alter table settings add(token varchar(100) DEFAULT '') ");
             executeDbSql("update settings set version = '2.4.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.2', $version);
         case '2.4.2':
             executeDbSql("update settings set version = '2.4.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.3', $version);
         case '2.4.3':
             executeDbSql("update settings set version = '2.4.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.4', $version);
         case '2.4.4':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -274,27 +274,27 @@ 
                 );
             }
             executeDbSql("update settings set version = '2.4.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.5', $version);
         case '2.4.5':
             executeDbSql("update settings set version = '2.5.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.0', $version);
         case '2.5.0':
             executeDbSql("update settings set version = '2.5.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.1', $version);
         case '2.5.1':
             executeDbSql("update settings set version = '2.5.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.2', $version);
         case '2.5.2':
             executeDbSql("update settings set version = '2.5.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.3', $version);
         case '2.5.3':
             executeDbSql("update settings set version = '2.6.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.6.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.6.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.6.0', $version);
         case '2.6.0':
             $sql = "ALTER TABLE users
@@ -370,7 +370,7 @@ 
             executeDbSql($sql);
             executeDbSql("update settings set version = '3.0.0-pre1'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->3.0.0-pre1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->3.0.0-pre1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '3.0.0-pre1', $version);
         case '3.0.0-pre1':
             $sql = "CREATE TABLE IF NOT EXISTS notifications (