TechWilk / rota

public/old/includes/functions.roles.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
     $sql = "UPDATE roles SET name = '$name', description = '$description' WHERE id = '$id'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -39,13 +39,13 @@ 
     $sql = "UPDATE groups SET name = '$name' WHERE groupId = '$key'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 
     $sql = "UPDATE groups SET description = '$description' WHERE groupId = '$key'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -54,7 +54,7 @@ 
     $sql = "UPDATE roles SET groupId = '$value' WHERE id = '$roleID'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -131,7 +131,7 @@ 
         return $ob->allowRoleSwaps;
     }
 
-    $sql = "SELECT allowRoleSwaps FROM groups WHERE id = '".$ob->groupId."'";
+    $sql = "SELECT allowRoleSwaps FROM groups WHERE id = '" . $ob->groupId . "'";
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $ob = mysqli_fetch_object($result);
 

public/old/includes/functions.database.php

Spacing +28 added lines, -28 removed lines

@@ -26,14 +26,14 @@ 
 function executeDbSql($sql)
 {
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()).', SQL: '.$sql);
+        die('Error: ' . mysqli_error(db()) . ', SQL: ' . $sql);
     }
 }
 
 function updateDatabase()
 {
     $sql = 'SELECT VERSION( ) AS mysqli_version';
-    $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db()));
+    $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db()));
     $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
     $mysqli_version = $dbv['mysqli_version'];
     //echo $mysqli_version."<br>";
@@ -87,41 +87,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,
@@ -137,21 +137,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) {
@@ -199,33 +199,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 (

public/old/includes/functions.event.php

Spacing +69 added lines, -69 removed lines

@@ -14,7 +14,7 @@ 
     $sql = ("INSERT INTO eventPeople (eventId, userRoleId) VALUES ('$eventId', '$userRoleId')");
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -29,7 +29,7 @@ 
 {
     $sql = "DELETE FROM eventPeople WHERE eventId = '$id' AND userRoleId = '$userRoleId'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -170,40 +170,40 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $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);
     }
@@ -233,60 +233,60 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $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);
     }
@@ -315,39 +315,39 @@ 
 
     $ob = mysqli_fetch_object($result);
 
-    $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);
     }
@@ -496,7 +496,7 @@ 
 
     $sql = "UPDATE eventGroups SET archived = true WHERE id = '$seriesId'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -505,13 +505,13 @@ 
     $sql = "INSERT INTO bandMembers (bandId, userRoleId) VALUES ('$bandId', '$userRoleId')";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 }
 
 function getEventUrl($eventId)
 {
-    return 'event.php?id='.$eventId;
+    return 'event.php?id=' . $eventId;
 }
 
 function getEventDetails($eventID, $separator, $type = 4, $apprev_description = true, $prefix = '')
@@ -551,9 +551,9 @@ 
 						e.id = $eventID ";
 
     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 ';
 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
@@ -571,32 +571,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/settings.php

Spacing +3 added lines, -3 removed lines

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

src/dependencies.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 $container = $app->getContainer();
 
 // TWIG view renderer
-$container['view'] = function ($c) {
+$container['view'] = function($c) {
     $settings = $c->get('settings')['renderer'];
     $view = new Twig($settings['template_path'], [
         'cache' => false, // or 'path/to/cache'
@@ -46,7 +46,7 @@ 
     $env = $view->getEnvironment();
     $env->addGlobal('site', new Site());
     $env->addGlobal('currenturl', $c->get('request')->getUri());
-    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath().'/'.$c->get('request')->getUri()->getPath());
+    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath() . '/' . $c->get('request')->getUri()->getPath());
 
     if (isset($_SESSION['userId'])) {
         $u = UserQuery::create()->findPk($_SESSION['userId']);
@@ -59,7 +59,7 @@ 
 };
 
 // monolog
-$container['logger'] = function ($c) {
+$container['logger'] = function($c) {
     $settings = $c->get('settings')['logger'];
     $logger = new Monolog\Logger($settings['name']);
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -68,7 +68,7 @@ 
     return $logger;
 };
 
-$container['auth'] = function ($c) {
+$container['auth'] = function($c) {
     $authConfig = getConfig()['auth'];
 
     // full domain e.g. https://example.com
@@ -86,7 +86,7 @@ 
             break;
 
         case 'onebody':
-            $url = $authConfig['onebody']['url'].'/';
+            $url = $authConfig['onebody']['url'] . '/';
             $email = new EmailAddress($authConfig['onebody']['email']);
             $apiKey = $authConfig['onebody']['apiKey'];
 
@@ -116,6 +116,6 @@ 
     return new Authentication($c, $authProvider, $allowedRoutes);
 };
 
-$container['csrf'] = function ($c) {
+$container['csrf'] = function($c) {
     return new Guard();
 };

src/middleware.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // Application middleware
 
 // 4) add route information to twig
-$app->add(function (Request $request, Response $response, callable $next) {
+$app->add(function(Request $request, Response $response, callable $next) {
     $route = $request->getAttribute('route');
 
     // return NotFound for non existent route

src/classes/Controller/InstallController.php

Spacing +12 added lines, -12 removed lines

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

generated-conf/propel.php

Spacing +2 added lines, -2 removed lines

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

public/old/events.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 }
 
 if (isset($_GET['filter'])) {
-    header('Location: ../events/type/'.(int) $_GET['filter']);
+    header('Location: ../events/type/' . (int) $_GET['filter']);
     exit;
 }