TechWilk / rota

public/old/editeventtype.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,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;
 }
 

public/old/series.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,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;
 }
 
@@ -40,7 +40,7 @@ 
             $sql = "UPDATE cr_eventGroups SET name = '$name', description = '$description' WHERE id = '$editid'";
         }
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         $name = $_POST['seriesName'];
@@ -54,7 +54,7 @@ 
         } else {
             $sql = ("INSERT INTO cr_eventGroups (name, description) VALUES ('$name', '$description')");
             if (!mysqli_query(db(), $sql)) {
-                die('Error: '.mysqli_error(db()));
+                die('Error: ' . mysqli_error(db()));
             }
 
             // After we have inserted the data, we want to head back to the main users page
@@ -97,9 +97,9 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $seriesId = $row['id'];
-        echo "<span id='".$seriesId."' class='edit'><strong>".$row['name'].'</strong></span>';
-        echo " <a href='series.php?method=remove&series=".$seriesId."'><i class='fa fa-close'></i></a><br />";
-        echo "<p id='".$seriesId."' class='edit'>".$row['description'].'</p>';
+        echo "<span id='" . $seriesId . "' class='edit'><strong>" . $row['name'] . '</strong></span>';
+        echo " <a href='series.php?method=remove&series=" . $seriesId . "'><i class='fa fa-close'></i></a><br />";
+        echo "<p id='" . $seriesId . "' class='edit'>" . $row['description'] . '</p>';
         echo '<hr />';
     } ?>
  </div><!-- /.box-body -->

public/old/pendingAccounts.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,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;
 }
 
@@ -31,14 +31,14 @@ 
     case 'approve':
       $userId = approvePendingUser($id);
       mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
+      header('Location: addUser.php?action=edit&user=' . $userId);
       break;
     case 'merge':
       $existingUserId = $_POST['existingUser'];
       $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
       mergePendingUserWithUserId($id, $existingUserId);
       mailNewUser($existingUserId);
-      header('Location: addUser.php?action=edit&user='.$existingUserId);
+      header('Location: addUser.php?action=edit&user=' . $existingUserId);
       break;
     case 'decline':
       declinePendingUser($id);
@@ -90,7 +90,7 @@ 
 <div class="box box-primary">
   <div class="box-header">
     <h2 class="box-title">
-      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?>
+      <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?>
     </h2>
   </div>
   <div class="box-body">
@@ -131,7 +131,7 @@ 
             <?php
             $users = allUsersNames();
             foreach ($users as $existingUser): ?>
-            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option>
+            <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option>
             <?php endforeach; ?>
           </select>
         </div>

public/old/settings.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,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;
 }
 
@@ -165,7 +165,7 @@ 
 		skin='$skin'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     header('Location: settings.php');
 }
@@ -192,7 +192,7 @@ 
 	<!-- Content Header (Page header) -->

 	<section class="content-header">

 		<h1>Settings

-			<?php echo '<small>v'.$row['version'].'</small>'; ?>

+			<?php echo '<small>v' . $row['version'] . '</small>'; ?>

 		</h1>

 		<ol class="breadcrumb">

 			<li><a href="<?php echo siteSettings()->getSiteUrl() ?>"><i class="fa fa-dashboard"></i> Home</a></li>

public/old/install.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
 } catch (\Exception $e) {
 }
 
-$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+$url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 $url = substr($url, 0, -12); // remove "/install.php" from url
 
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -48,7 +48,7 @@ 
         //exit;
         $conn->exec($sql);
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding tables to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding tables to database: ' . $e->getMessage();
         exit;
     }
 
@@ -58,7 +58,7 @@ 
     $lastname = $_POST['lastname'];
     $lastname = trim(strip_tags($lastname));
 
-    $username = strtolower($firstname).'.'.strtolower($lastname);
+    $username = strtolower($firstname) . '.' . strtolower($lastname);
 
     $password = $_POST['password'];
 
@@ -82,7 +82,7 @@ 
     try {
         $user->save();
     } catch (\Exception $e) {
-        echo 'Error (code: '.$e->getCode().') adding user to database: '.$e->getMessage();
+        echo 'Error (code: ' . $e->getCode() . ') adding user to database: ' . $e->getMessage();
         exit;
     }
 
@@ -179,7 +179,7 @@ 
 
     $settings->save();
 
-    header('Location: login.php?username='.$username); // Move to the home page of the admin section
+    header('Location: login.php?username=' . $username); // Move to the home page of the admin section
     exit;
 }
 

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;
         }
     }