TechWilk / rota

generated-classes/TechWilk/Rota/User.php

Doc Comments +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
     /**
      * Determine if the user is marked as available for an event.
      *
-     * @return bool if user is available
+     * @return null|boolean if user is available
      */
     public function isAvailableForEvent(Event $event)
     {

Spacing +13 added lines, -13 removed lines

@@ -77,7 +77,7 @@ 
      */
     public function getName()
     {
-        return $this->firstname.' '.$this->lastname;
+        return $this->firstname . ' ' . $this->lastname;
     }
 
     /**
@@ -96,16 +96,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') {
@@ -114,16 +114,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;
                     }
                 }
@@ -132,16 +132,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;
         }
     }

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if (!password_verify($v, $this->password)) {
             $bcrypt_options = [
         'cost' => 12,
-      ];
+        ];
             $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
 
             $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;

public/old/includes/functions.database.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace TechWilk\Rota;
 
-use DateTime;
-
 /*
     This file is part of Church Rota.
 

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 (

src/classes/Authentication.php

Doc Comments +3 added lines

@@ -119,6 +119,9 @@
         return true;
     }
 
+    /**
+     * @param EmailAddress $username
+     */
     private function numberOfLoginAttemptsIsOk($username)
     {
         $numberOfAllowedAttempts = 8;

public/api/v1/index.php

Braces +3 added lines, -1 removed lines

@@ -419,7 +419,9 @@
 // End of very very very basic auth
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-else:
+else {
+    :
 http_response_code(401);
+}
 
 endif;

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

public/plugins/datatables/extensions/Scroller/examples/data/ssp.php

Spacing +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 // parameter represents the DataTables column identifier. In this case simple
 // indexes
 $columns = [
-    ['db' => 'id',         'dt' => 0],
-    ['db' => 'firstname',  'dt' => 1],
-    ['db' => 'surname',    'dt' => 2],
-    ['db' => 'zip',        'dt' => 3],
-    ['db' => 'country',    'dt' => 4],
+    ['db' => 'id', 'dt' => 0],
+    ['db' => 'firstname', 'dt' => 1],
+    ['db' => 'surname', 'dt' => 2],
+    ['db' => 'zip', 'dt' => 3],
+    ['db' => 'country', 'dt' => 4],
 ];
 
 // SQL server connection information

public/old/swaps.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 // ensure user is allowed to see page
 
 if (!isAdmin() && $queryStringUser != $sessionUserId) {
-    header('Location: swaps.php?user='.$sessionUserId);
+    header('Location: swaps.php?user=' . $sessionUserId);
 }
 
 // fetch swaps
@@ -90,11 +90,11 @@ 
               <p>
                 <strong>
                   <s class="text-red">
-                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                   </s>
                   &#8594;
                   <span class="text-green">
-                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                   </span>
                 </strong>
               </p>

public/old/overview.php

Spacing +2 added lines, -2 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;
 }
 
@@ -115,7 +115,7 @@ 
 
 		  <?php
             else:
-                echo '<div class="box-body">'.$sentSuccess.'</div>';
+                echo '<div class="box-body">' . $sentSuccess . '</div>';
             endif;
             ?>
 				</div>

Braces +3 added lines, -1 removed lines

@@ -114,8 +114,10 @@
 			</form>
 
 		  <?php
-            else:
+            else {
+                :
                 echo '<div class="box-body">'.$sentSuccess.'</div>';
+            }
             endif;
             ?>
 				</div>

public/old/swap.php

Switch Indentation +24 added lines, -24 removed lines

@@ -64,21 +64,21 @@ 
   case 'accept':
     if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (acceptSwap($swapId)) {
-        case '1':
-          $message = 'Swap Successful';
-          break;
-        case '2':
-          $message = 'Swap already accepted.';
-          break;
-        case '3':
-          $message = 'Swap already declined.';
-          break;
-        case '4':
-          $message = 'Swap already reverted.';
-          break;
-        default:
-          $err = 'Technical issue - please inform system administrator';
-          break;
+            case '1':
+              $message = 'Swap Successful';
+              break;
+            case '2':
+              $message = 'Swap already accepted.';
+              break;
+            case '3':
+              $message = 'Swap already declined.';
+              break;
+            case '4':
+              $message = 'Swap already reverted.';
+              break;
+            default:
+              $err = 'Technical issue - please inform system administrator';
+              break;
       }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
@@ -87,15 +87,15 @@ 
   case 'decline':
     if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (declineSwap($swapId)) {
-        case '1':
-          $message = 'Swap declined';
-          break;
-        case '2':
-          $message = 'Swap already declined.';
-          break;
-        default:
-          $err = 'Technical issue - please inform system administrator';
-          break;
+            case '1':
+              $message = 'Swap declined';
+              break;
+            case '2':
+              $message = 'Swap already declined.';
+              break;
+            default:
+              $err = 'Technical issue - please inform system administrator';
+              break;
         }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';

Braces +5 added lines, -2 removed lines

@@ -271,14 +271,17 @@
 
         <?php endforeach; ?>
       
-      <?php else: ?>
+      <?php else {
+    : ?>
       <?php // event has no roles the user can cover?>
       
       <div class="alert alert-warning">
         <h4><i class="icon fa fa-info"></i>There are no roles in the event you are skilled to cover.</h4>
         <p>If you need adding to the rota, speak to an admin.</p>
       </div>
-      <?php endif; ?>
+      <?php endif;
+}
+?>
 
 
 <?php include 'includes/footer.php'; ?>

Indentation +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
 $swapId = filter_var($swapId, FILTER_SANITIZE_NUMBER_INT);
 
 switch ($action) {
-  case 'swap':
+    case 'swap':
     if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         $eventPersonId = $_POST['eventPerson'];
         $newUserRoleId = $_POST['newUserRole'];
@@ -61,48 +61,48 @@ 
         $err = 'Swap details incorrect, please try again.';
     }
     break;
-  case 'accept':
+    case 'accept':
     if (canAcceptSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (acceptSwap($swapId)) {
         case '1':
           $message = 'Swap Successful';
-          break;
+            break;
         case '2':
           $message = 'Swap already accepted.';
-          break;
+            break;
         case '3':
           $message = 'Swap already declined.';
-          break;
+            break;
         case '4':
           $message = 'Swap already reverted.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
-      }
+            break;
+        }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
-  case 'decline':
+    case 'decline':
     if (canDeclineSwap($swapId) || $verify == verificationCodeForSwap($swapId)) {
         switch (declineSwap($swapId)) {
         case '1':
           $message = 'Swap declined';
-          break;
+            break;
         case '2':
           $message = 'Swap already declined.';
-          break;
+            break;
         default:
           $err = 'Technical issue - please inform system administrator';
-          break;
+            break;
         }
     } else {
         $err = 'Swap Already Actioned or Verification Code Invalid';
     }
     break;
 
-  default:
+    default:
     // code...
     break;
 }
@@ -163,7 +163,7 @@ 
 		<section class="content">
       
       <?php
-      if (isset($message)): ?>
+        if (isset($message)): ?>
       
         <p><?php echo $message ?></p>
 
@@ -224,19 +224,19 @@ 
                 <label for="newUserRole">Swap To:</label>
                 <select name="newUserRole" class="form-control">
                   <?php
-                  if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
-                  } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
-                  }
-                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
-                  $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
-
-                  while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-                      ?>
+                    if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
+                        $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                    } else {
+                        $whereAnd = 'r.id = '.$role->roleId;
+                    }
+                    $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
+                    $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
+
+                    while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
+                        ?>
                     <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
                   <?php
-                  } ?>
+                    } ?>
                 </select>
               </div>
             </div>

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 if (!empty($eventId)) {
     // ensure user is logged in before allowing creation of swap
     if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId;
+        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId;
         header('Location: login.php');
     }
     $createSwap = true;
@@ -186,11 +186,11 @@ 
             <p>
               <strong>
                 <s class="text-red">
-                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                 </s>
                 &#8594;
                 <span class="text-green">
-                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                 </span>
               </strong>
             </p>
@@ -225,16 +225,16 @@ 
                 <select name="newUserRole" class="form-control">
                   <?php
                   if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                      $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE';
                   } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
+                      $whereAnd = 'r.id = ' . $role->roleId;
                   }
-                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
+                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM users u INNER JOIN userRoles ur ON ur.userId = u.id INNER JOIN roles r ON r.id = ur.roleId WHERE u.id <> ' . $role->userId . ' AND ' . $whereAnd . ' ORDER BY lastName, firstName, r.name';
                   $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
                   while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                       ?>
-                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
+                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option>
                   <?php
                   } ?>
                 </select>

public/old/subTypes.php

Indentation +2 added lines, -2 removed lines

@@ -53,8 +53,8 @@
     }
 
     // After we have inserted the data, we want to head back to the main users page
-     header('Location: subTypes.php'); // Move to the home page of the admin section
-      exit;
+        header('Location: subTypes.php'); // Move to the home page of the admin section
+        exit;
 }
 include 'includes/header.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;
 }
 
@@ -37,7 +37,7 @@ 
 
         $sql = ("INSERT INTO eventSubTypes (name, description) VALUES ('$name', '$description')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         // Otherwise we are dealing with edits, not new stuff
@@ -88,10 +88,10 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-        echo '<input type="hidden" name="formindex[]" value="'.$row['id'].'" />';
-        echo "<input name='name[]' value='".$row['name']."' />";
+        echo '<input type="hidden" name="formindex[]" value="' . $row['id'] . '" />';
+        echo "<input name='name[]' value='" . $row['name'] . "' />";
 
-        echo " <a href='subTypes.php?method=remove&subType=".$row['id']."'><i class='fa fa-times'></i></a><br />";
+        echo " <a href='subTypes.php?method=remove&subType=" . $row['id'] . "'><i class='fa fa-times'></i></a><br />";
     } ?>
    </div><!-- /.box-body -->
    <div class="box-footer">