TechWilk / rota

public/old/error.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 The following error has occurred
 <?php namespace TechWilk\Rota;
 
-echo " on page '".$page."':<br><br>";
+echo " on page '" . $page . "':<br><br>";
     echo '<strong>';
 
     switch ($no) {

public/old/includes/errors.php

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
 
 namespace TechWilk\Rota;
 
-ini_set('display_errors', false);    // set on for development, off for production
+ini_set('display_errors', false); // set on for development, off for production
 ini_set('log_errors', true);
 error_reporting(E_ALL);

public/old/includes/functions.php

Spacing +20 added lines, -20 removed lines

@@ -6,16 +6,16 @@ 
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 
-include __DIR__.'/errors.php';
+include __DIR__ . '/errors.php';
 
 // setup the autoloading
-require_once dirname(__FILE__).'/../../../vendor/autoload.php';
+require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
 
 // setup Propel
-require_once dirname(__FILE__).'/../../../generated-conf/config.php';
+require_once dirname(__FILE__) . '/../../../generated-conf/config.php';
 
 $defaultLogger = new Logger('defaultLogger');
-$defaultLogger->pushHandler(new StreamHandler(__DIR__.'/../../../logs/propel.log', Logger::WARNING));
+$defaultLogger->pushHandler(new StreamHandler(__DIR__ . '/../../../logs/propel.log', Logger::WARNING));
 
 $serviceContainer->setLogger('defaultLogger', $defaultLogger);
 
@@ -64,18 +64,18 @@ 
     return SettingsQuery::create()->findOne();
 }
 
-include __DIR__.'/functions.auth.php';
-include __DIR__.'/functions.notifications.php';
-include __DIR__.'/functions.mail.php';
-include __DIR__.'/functions.remove.php';
-include __DIR__.'/functions.discussion.php';
-include __DIR__.'/functions.event.php';
-include __DIR__.'/functions.password.php';
-include __DIR__.'/functions.users.php';
-include __DIR__.'/functions.roles.php';
-include __DIR__.'/functions.database.php';
-include __DIR__.'/functions.calendars.php';
-include __DIR__.'/functions.facebook.php';
+include __DIR__ . '/functions.auth.php';
+include __DIR__ . '/functions.notifications.php';
+include __DIR__ . '/functions.mail.php';
+include __DIR__ . '/functions.remove.php';
+include __DIR__ . '/functions.discussion.php';
+include __DIR__ . '/functions.event.php';
+include __DIR__ . '/functions.password.php';
+include __DIR__ . '/functions.users.php';
+include __DIR__ . '/functions.roles.php';
+include __DIR__ . '/functions.database.php';
+include __DIR__ . '/functions.calendars.php';
+include __DIR__ . '/functions.facebook.php';
 
 date_default_timezone_set(siteSettings()->getTimeZone());
 
@@ -175,7 +175,7 @@ 
         $stat_id = $_SESSION['login_statistic_id'];
         if (($stat_id != '') && ($stat_id != '0')) {
             $stat = StatisticQuery::create()->findPk($stat_id);
-            $stat->setDetail1($stat->getDetail1().'/'.$detail1);
+            $stat->setDetail1($stat->getDetail1() . '/' . $detail1);
             $stat->setDetail2($stat->getDate()->diff(new DateTime()));
             $stat->save();
 
@@ -208,7 +208,7 @@ 
         return 'never';
     }
 
-    return timeInWords($time).' ago';
+    return timeInWords($time) . ' ago';
 }
 
 function timeInWordsWithTense($time)
@@ -222,9 +222,9 @@ 
     }
 
     if ($time->getTimestamp() > (new DateTime())->getTimestamp()) {
-        return 'in '.timeInWords($time);
+        return 'in ' . timeInWords($time);
     } else {
-        return timeInWords($time).' ago';
+        return timeInWords($time) . ' ago';
     }
 }
 

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 die('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 die('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 die("Connection made, but database '".$config['db']['dbname']."' was not found.");
+$db = @mysqli_select_db($dbh, $config['db']['dbname']) or die("Connection made, but database '" . $config['db']['dbname'] . "' was not found.");
 
 // allow config to be fetched in functions
 

public/old/includes/functions.users.php

Spacing +18 added lines, -18 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 cr_users (firstName, lastName, username, email, mobile, password, created, updated)
@@ -46,12 +46,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;
@@ -145,7 +145,7 @@ 
     $sql = "SELECT firstName, lastName FROM cr_users WHERE id = '$id'";
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $ob = mysqli_fetch_object($result);
-    $name = $ob->firstName.' '.$ob->lastName;
+    $name = $ob->firstName . ' ' . $ob->lastName;
 
     return $name;
 }
@@ -219,7 +219,7 @@ 
     $currentTimestamp = date('Y-m-d H:i:s');
     $sql = "UPDATE cr_users SET password = '$newPassword', passwordChanged = '$currentTimestamp' WHERE id = '$userId'";
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
-    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)
@@ -264,7 +264,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;
     }
@@ -340,11 +340,11 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     $pendingId = mysqli_insert_id(db());
-    $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);
 
@@ -416,7 +416,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;
@@ -499,32 +499,32 @@ 
 
 function getProfileImageUrl($userId, $size = 'small')
 {
-    $sql = 'SELECT sa.socialId, u.email FROM cr_users u LEFT JOIN cr_socialAuth sa ON sa.userId = u.id WHERE id = '.$userId;
+    $sql = 'SELECT sa.socialId, u.email FROM cr_users u LEFT JOIN cr_socialAuth sa ON sa.userId = u.id WHERE id = ' . $userId;
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $user = mysqli_fetch_object($result);
 
     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/header.php

Spacing +3 added lines, -3 removed lines

@@ -294,7 +294,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>
@@ -304,7 +304,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 -->
@@ -359,7 +359,7 @@ 
 						<!-- User Account Menu -->
 						<li class="dropdown user user-menu">
 							<?php
-                            $sql = 'SELECT u.created FROM cr_users u WHERE id = '.$_SESSION['userid'];
+                            $sql = 'SELECT u.created FROM cr_users u WHERE id = ' . $_SESSION['userid'];
                                             $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                                             $currentUser = 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 cr_users add(isOverviewRecipient char(2) NOT NULL DEFAULT '0')");
             executeDbSql('alter table cr_groups add(short_name char(2))');
 
-            executeDbSql("update cr_settings set lang_locale = 'en_GB'");                     // de_DE
+            executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE
             executeDbSql('update cr_settings set event_sorting_latest = 0');
             executeDbSql('update cr_settings set snapshot_show_two_month = 0');
             executeDbSql('update cr_settings set snapshot_reduce_skills_by_group = 0');
             executeDbSql('update cr_settings set logged_in_show_snapshot_button = 0');
             executeDbSql("update cr_settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update cr_settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update cr_settings set version = '2.1.0'");
             executeDbSql('update cr_settings set users_start_with_myevents = 0');
             executeDbSql("update cr_settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
             executeDbSql("update cr_settings set google_group_calendar = ''");
             executeDbSql("update cr_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 cr_settings_bkp2_1_0 as select * from cr_settings');
             executeDbSql('alter table cr_settings add(group_sorting_name int(1))');
             executeDbSql("update cr_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 cr_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 cr_settings add(debug_mode int(1) DEFAULT '0')");
-            executeDbSql('update cr_settings set group_sorting_name = 0');  //was a workaround, fixed in V2.2.1
+            executeDbSql('update cr_settings set group_sorting_name = 0'); //was a workaround, fixed in V2.2.1
 
             executeDbSql("update cr_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 cr_users add(isBandAdmin char(2) NOT NULL DEFAULT '0')");
             executeDbSql('update cr_settings set group_sorting_name = 0'); //due to an error reset it again
 
             executeDbSql("update cr_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 `cr_statistics` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -137,21 +137,21 @@ 
             executeDbSql($sql);
 
             executeDbSql("update cr_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 cr_users add(isEventEditor char(2) NOT NULL DEFAULT '0')");
 
             executeDbSql("update cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_settings add(days_to_alert int(2) DEFAULT 5) ');
             executeDbSql("alter table cr_settings add(token varchar(100) DEFAULT '') ");
             executeDbSql("update cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_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 cr_users
@@ -370,7 +370,7 @@ 
             executeDbSql($sql);
             executeDbSql("update cr_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 cr_notifications (

public/old/includes/functions.auth.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,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
@@ -29,13 +29,13 @@ 
 
         // 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
         }
 
         // Update last login timestamp
         $currentTimestamp = date('Y-m-d H:i:s');
-        $sql = "UPDATE cr_users SET lastLogin = '$currentTimestamp' WHERE id = '".$row['id']."'";
+        $sql = "UPDATE cr_users SET lastLogin = '$currentTimestamp' WHERE id = '" . $row['id'] . "'";
         mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
         // redirect
@@ -44,11 +44,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/includes/functions.roles.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
     $sql = "UPDATE cr_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 cr_groups SET name = '$name' WHERE groupId = '$key'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
 
     $sql = "UPDATE cr_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 cr_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 cr_groups WHERE id = '".$ob->groupId."'";
+    $sql = "SELECT allowRoleSwaps FROM cr_groups WHERE id = '" . $ob->groupId . "'";
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $ob = mysqli_fetch_object($result);