TechWilk / rota

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

Indentation +110 added lines, -110 removed lines

@@ -179,10 +179,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>Events this week:</h2>
 
@@ -206,17 +206,17 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->getId() ?>">
                 <h4><?php
-                  echo $event->getDate('jS: ');
-                  $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
-                  $roles = [];
-                  foreach ($eventPeople as $eventPerson) {
-                      if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
-                          $roles[] = $eventPerson->getUserRole()->getRole()->getName();
-                      }
-                  }
-                  $roles = implode(', ', $roles);
-                  echo $roles != '' ? $roles : 'No involvement';
-                  ?>
+                    echo $event->getDate('jS: ');
+                    $eventPeople = EventPersonQuery::create()->filterByEvent($event)->find();
+                    $roles = [];
+                    foreach ($eventPeople as $eventPerson) {
+                        if ($eventPerson->getUserRole()->getUserId() == $user->getId()) {
+                            $roles[] = $eventPerson->getUserRole()->getRole()->getName();
+                        }
+                    }
+                    $roles = implode(', ', $roles);
+                    echo $roles != '' ? $roles : 'No involvement';
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->getEventTypeId() ?>"><?php echo $event->getEventType()->getName() ?></a>
@@ -271,7 +271,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -287,47 +287,47 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0) {
-                      ?>
+                    if (mysqli_num_rows($resultPeople) > 0) {
+                        ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
-                          if ($viewPeople->group == $groupId) {
-                              // Do nothing, because they are all in the same group
-                          } else {
-                              // Update the group heading
-                              $groupId = $viewPeople->group;
-                              $groupName = $viewPeople->groupName;
-                              if ($firstTime) {
-                                  $firstTime = false;
-                              } else {
-                                  echo '</ul>';
-                              }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
-                              echo '<ul>';
-                          }
-
-                          echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
-                          echo $viewPeople->name;
-
-                          if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
-                          } else {
-                              // If there is no skill, we don't need to mention this.
-                          }
-                          echo (isset($viewPeople->swap)) ? '</a></s>' : '';
-
-                          echo '</li>';
-                      }
-                      echo '</ul>';
-                  } else {
-                      echo '<p>No roles assigned to this event.';
-                  }
+                            if ($viewPeople->group == $groupId) {
+                                // Do nothing, because they are all in the same group
+                            } else {
+                                // Update the group heading
+                                $groupId = $viewPeople->group;
+                                $groupName = $viewPeople->groupName;
+                                if ($firstTime) {
+                                    $firstTime = false;
+                                } else {
+                                    echo '</ul>';
+                                }
+                                echo '<p><strong>'.$groupName.'</strong></p>';
+                                echo '<ul>';
+                            }
+
+                            echo '<li>';
+                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                            echo $viewPeople->name;
+
+                            if ($viewPeople->rolename != '') {
+                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            } else {
+                                // If there is no skill, we don't need to mention this.
+                            }
+                            echo (isset($viewPeople->swap)) ? '</a></s>' : '';
+
+                            echo '</li>';
+                        }
+                        echo '</ul>';
+                    } else {
+                        echo '<p>No roles assigned to this event.';
+                    }
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -361,10 +361,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -389,9 +389,9 @@ 
             <div class="timeline-header">
               <a href="event.php?id=<?php echo $event->id ?>">
                 <h4><?php
-                  echo date('jS: ', strtotime($event->date));
-                  echo $event->roles;
-                  ?>
+                    echo date('jS: ', strtotime($event->date));
+                    echo $event->roles;
+                    ?>
                 </h4>
               </a>
               <a class="label label-default" href="events.php?view=all&filter=<?php echo $event->eventTypeId ?>"><?php echo $event->eventType ?></a>
@@ -447,7 +447,7 @@ 
                 <div class="modal-body">
                   <?php
 
-                  $sqlPeople = "SELECT
+                    $sqlPeople = "SELECT
                                 CONCAT(u.firstname, ' ', u.lastname) AS `name`,
                                 r.name AS `rolename`,
                                 ep.notified AS `notified`,
@@ -463,47 +463,47 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or exit(mysqli_error(db()));
+                    $groupName = '';
+                    $groupId = 0;
+                    $identifier = '1';
+                    $firstTime = true;
 
-                  if (mysqli_num_rows($resultPeople) > 0) {
-                      ?>
+                    if (mysqli_num_rows($resultPeople) > 0) {
+                        ?>
                     <?php while ($viewPeople = mysqli_fetch_object($resultPeople)) {
-                          if ($viewPeople->group == $groupId) {
-                              // Do nothing, because they are all in the same group
-                          } else {
-                              // Update the group heading
-                              $groupId = $viewPeople->group;
-                              $groupName = $viewPeople->groupName;
-                              if ($firstTime) {
-                                  $firstTime = false;
-                              } else {
-                                  echo '</ul>';
-                              }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
-                              echo '<ul>';
-                          }
-
-                          echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
-                          echo $viewPeople->name;
-
-                          if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
-                          } else {
-                              // If there is no skill, we don't need to mention this.
-                          }
-                          echo (isset($viewPeople->swap)) ? '</a></s>' : '';
-
-                          echo '</li>';
-                      }
-                      echo '</ul>';
-                  } else {
-                      echo '<p>No roles assigned to this event.';
-                  }
+                            if ($viewPeople->group == $groupId) {
+                                // Do nothing, because they are all in the same group
+                            } else {
+                                // Update the group heading
+                                $groupId = $viewPeople->group;
+                                $groupName = $viewPeople->groupName;
+                                if ($firstTime) {
+                                    $firstTime = false;
+                                } else {
+                                    echo '</ul>';
+                                }
+                                echo '<p><strong>'.$groupName.'</strong></p>';
+                                echo '<ul>';
+                            }
+
+                            echo '<li>';
+                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                            echo $viewPeople->name;
+
+                            if ($viewPeople->rolename != '') {
+                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                            } else {
+                                // If there is no skill, we don't need to mention this.
+                            }
+                            echo (isset($viewPeople->swap)) ? '</a></s>' : '';
+
+                            echo '</li>';
+                        }
+                        echo '</ul>';
+                    } else {
+                        echo '<p>No roles assigned to this event.';
+                    }
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -538,10 +538,10 @@ 
     <div class="col-sm-4 col-md-4 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~ Remaining events ~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~ Remaining events ~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
       <?php if (isset($remainingEventsInGroups)) { ?>
 
       <div class="row">
@@ -617,10 +617,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User details ~~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User details ~~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <div class="box box-widget widget-user-2">
         <div class="widget-user-header bg-yellow">

Spacing +12 added lines, -12 removed lines

@@ -223,7 +223,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName().': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '('.$event->getBibleVerse().')' : '' ?></p>
+              <p><strong><?php echo $event->getEventGroup() ? $event->getEventGroup()->getName() . ': ' : '' ?></strong><?php echo $event->getSermonTitle() ?> <?php echo $event->getBibleVerse() ? '(' . $event->getBibleVerse() . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->getLocation()->getName(); ?></p>
 
               <?php if ($event->getComments()) { ?>
@@ -283,7 +283,7 @@ 
                                   INNER JOIN groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->getId()."'
+                                WHERE ep.eventId = '".$event->getId() . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -307,16 +307,16 @@ 
                               } else {
                                   echo '</ul>';
                               }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
+                              echo '<p><strong>' . $groupName . '</strong></p>';
                               echo '<ul>';
                           }
 
                           echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                           echo $viewPeople->name;
 
                           if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
+                              echo ' - <em>' . $viewPeople->rolename . '</em>';
                           } else {
                               // If there is no skill, we don't need to mention this.
                           }
@@ -398,7 +398,7 @@ 
             </div><!-- /.timeline-header -->
 
             <div class="timeline-body">
-              <p><strong><?php echo $event->eventGroup ? $event->eventGroup.': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '('.$event->bibleVerse.')' : '' ?></p>
+              <p><strong><?php echo $event->eventGroup ? $event->eventGroup . ': ' : '' ?></strong><?php echo $event->sermonTitle ?> <?php echo $event->bibleVerse ? '(' . $event->bibleVerse . ')' : '' ?></p>
               <p><strong>Location:</strong> <?php echo $event->eventLocation; ?></p>
 
               <?php if ($event->comment != '') { ?>
@@ -459,7 +459,7 @@ 
                                   INNER JOIN groups g ON g.id = r.groupId
                                   INNER JOIN users u ON u.id = ur.userId
                                   INNER JOIN eventPeople ep ON ep.userRoleId = ur.id
-                                WHERE ep.eventId = '".$event->id."'
+                                WHERE ep.eventId = '".$event->id . "'
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
@@ -483,16 +483,16 @@ 
                               } else {
                                   echo '</ul>';
                               }
-                              echo '<p><strong>'.$groupName.'</strong></p>';
+                              echo '<p><strong>' . $groupName . '</strong></p>';
                               echo '<ul>';
                           }
 
                           echo '<li>';
-                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                          echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                           echo $viewPeople->name;
 
                           if ($viewPeople->rolename != '') {
-                              echo ' - <em>'.$viewPeople->rolename.'</em>';
+                              echo ' - <em>' . $viewPeople->rolename . '</em>';
                           } else {
                               // If there is no skill, we don't need to mention this.
                           }
@@ -628,7 +628,7 @@ 
             <img class="img-circle" src="<?php echo getProfileImageUrl($_SESSION['userid'], 'large') ?>" alt="User Avatar">
           </div>
           <!-- /.widget-user-image -->
-          <h3 class="widget-user-username"><?php echo $user->getFirstName().' '.$user->getLastName() ?></h3>
+          <h3 class="widget-user-username"><?php echo $user->getFirstName() . ' ' . $user->getLastName() ?></h3>
           <h5 class="widget-user-desc">Account created <?php echo $user->getCreated('M. Y') ?></h5>
         </div>
         <div class="box-footer no-padding">
@@ -652,7 +652,7 @@ 
                 $userHasEmail = (strlen($user->getEmail()) > 3);
                 $emailRemindersEnabled = ($userHasEmail && true); // todo: add opt-out for email reminders
                 ?>
-                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert().' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
+                Email Reminders <span class="pull-right badge bg-<?php echo $emailRemindersEnabled ? 'green' : 'red' ?>"><?php echo $emailRemindersEnabled ? siteSettings()->getDaysToAlert() . ' days before' : ($userHasEmail ? 'Disabled' : 'No email address') ?></span>
               </a>
             </li>
             <li>

public/old/settings.php

Indentation +11 added lines, -11 removed lines

@@ -342,17 +342,17 @@
 					<label for="skin">Application skin:</label>
 					<select name="skin" id="skin" class="form-control">
 						<?php $skinOptions = ['skin-blue-light'                                           => 'Blue &amp; Light',
-						    'skin-blue'                                                                   => 'Blue &amp; Dark',
-						    'skin-yellow-light'                                                           => 'Yellow &amp; Light',
-						    'skin-yellow'                                                                 => 'Yellow &amp; Dark',
-						    'skin-green-light'                                                            => 'Green &amp; Light',
-						    'skin-green'                                                                  => 'Green &amp; Dark',
-						    'skin-purple-light'                                                           => 'Purple &amp; Light',
-						    'skin-purple'                                                                 => 'Purple &amp; Dark',
-						    'skin-red-light'                                                              => 'Red &amp; Light',
-						    'skin-red'                                                                    => 'Red &amp; Dark',
-						    'skin-black-light'                                                            => 'Black &amp; Light',
-						    'skin-black'                                                                  => 'Black &amp; Dark', ];
+                            'skin-blue'                                                                   => 'Blue &amp; Dark',
+                            'skin-yellow-light'                                                           => 'Yellow &amp; Light',
+                            'skin-yellow'                                                                 => 'Yellow &amp; Dark',
+                            'skin-green-light'                                                            => 'Green &amp; Light',
+                            'skin-green'                                                                  => 'Green &amp; Dark',
+                            'skin-purple-light'                                                           => 'Purple &amp; Light',
+                            'skin-purple'                                                                 => 'Purple &amp; Dark',
+                            'skin-red-light'                                                              => 'Red &amp; Light',
+                            'skin-red'                                                                    => 'Red &amp; Dark',
+                            'skin-black-light'                                                            => 'Black &amp; Light',
+                            'skin-black'                                                                  => 'Black &amp; Dark', ];
 
     foreach ($skinOptions as $skinName => $skinDescription) { ?>
 						<option value="<?php echo $skinName ?>" <?php echo ($skinName == $row['skin']) ? 'selected' : '' ?>><?php echo $skinDescription ?></option>

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)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('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>

public/old/events.php

Spacing +22 added lines, -22 removed lines

@@ -50,9 +50,9 @@ 
 } else {
     $urlFilters = '';
     if (isset($_SESSION['lastEventsFilter'])) {
-        $urlFilters = '&filter='.$_SESSION['lastEventsFilter'];
+        $urlFilters = '&filter=' . $_SESSION['lastEventsFilter'];
     }
-    header('Location: events.php?view=all'.$urlFilters);
+    header('Location: events.php?view=all' . $urlFilters);
     exit;
 }
 
@@ -72,7 +72,7 @@ 
         session_destroy();
         header('Location: login.php');
     } else {
-        header('Location: events.php?view='.$sessionUserID);
+        header('Location: events.php?view=' . $sessionUserID);
         exit;
     }
 }
@@ -110,11 +110,11 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            exit('Error: '.mysqli_error(db()));
+            exit('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 
@@ -127,12 +127,12 @@ 
 
             $sql = ("INSERT INTO eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
             if (!mysqli_query(db(), $sql)) {
-                exit('Error: '.mysqli_error(db()));
+                exit('Error: ' . mysqli_error(db()));
             }
         }
 
         // After we have inserted the data, we want to head back to the main page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 }
@@ -178,7 +178,7 @@ 
                     $result = mysqli_query(db(), $mysqli_query) or exit(mysqli_error(db()));
                     $row = mysqli_fetch_object($result);
 
-                    echo $row->name.'s';
+                    echo $row->name . 's';
                 } elseif ($_SESSION['onlyShowUserEvents'] == '1') {
                     echo 'My Events';
                 } else {
@@ -204,7 +204,7 @@ 
 
 			<?php if (!empty($pendingSwaps) && $pendingSwaps > 0) {
                     if ($pendingSwaps > 1) {
-                        $swapsMessage = $pendingSwaps.' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
+                        $swapsMessage = $pendingSwaps . ' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
                     } else {
                         $swapsMessage = 'A swap is pending approval. An email has been sent to the person covering to approve the swap.';
                     } ?>
@@ -271,7 +271,7 @@ 
 							WHERE e.type = '$filter'
 							AND e.date >= DATE(NOW())
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     } else {
         $sql = "SELECT
 							DISTINCT e.id AS id,
@@ -298,7 +298,7 @@ 
 							WHERE e.date >= DATE(NOW())
 							AND ur.userId = '$view'
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     }
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
@@ -316,7 +316,7 @@ 
         $newMonth = strftime('%B %Y', strtotime($row->sundayDate));
         if ($month != $newMonth) {
             $month = $newMonth;
-            echo '<li class="time-label"><span class="bg-green">'.$month.'</span></li>';
+            echo '<li class="time-label"><span class="bg-green">' . $month . '</span></li>';
         }
 
         // Event details?>
@@ -330,9 +330,9 @@ 
 						<h4><?php
                             echo date('jS: ', strtotime($row->sundayDate));
         if ($eventName != '') {
-            echo '<strong>'.$eventName.'</strong><br />'.$subType.' - <em>'.$type.'</em>';
+            echo '<strong>' . $eventName . '</strong><br />' . $subType . ' - <em>' . $type . '</em>';
         } else {
-            echo $subType.' - <em>'.$type.'</em>';
+            echo $subType . ' - <em>' . $type . '</em>';
         } ?>
 						</h4>
 					</a>
@@ -344,7 +344,7 @@ 
 				<?php //<p><strong>Rehearsal:</strong> <?php
                 //echo ($row->rehearsalDateFormatted = "0000-00-00 00:00:00") ? "none" : strftime(siteSettings()->time_format_normal,strtotime($row->rehearsalDateFormatted));</p>?>
 
-				<p><strong><?php echo $row->eventGroup ? $row->eventGroup.': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '('.$row->bibleVerse.')' : '' ?></p>
+				<p><strong><?php echo $row->eventGroup ? $row->eventGroup . ': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '(' . $row->bibleVerse . ')' : '' ?></p>
 
 				<p><strong>Location:</strong> <?php echo $row->eventLocation; ?></p>
 
@@ -409,16 +409,16 @@ 
                     } else {
                         echo '</ul>';
                     }
-                    echo '<p><strong>'.$groupName.'</strong></p>';
+                    echo '<p><strong>' . $groupName . '</strong></p>';
                     echo '<ul>';
                 }
 
                 echo '<li>';
-                echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                 echo $viewPeople->name;
 
                 if ($viewPeople->rolename != '') {
-                    echo ' - <em>'.$viewPeople->rolename.'</em>';
+                    echo ' - <em>' . $viewPeople->rolename . '</em>';
                 } else {
                     // If there is no skill, we don't need to mention this.
                 }
@@ -445,9 +445,9 @@ 
 
 				<?php
                 if (isAdmin() || $userisBandAdmin || $userisEventEditor) {
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=".$eventID."'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=" . $eventID . "'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
                 }
         if (isAdmin()) {
             //echo "<a class='btn btn-primary' href='index.php?notifyEveryone=true&eventID=$eventID'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
@@ -456,7 +456,7 @@ 
 
             echo "<ul class='dropdown-menu'>";
 
-            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal".$eventID."'>Delete</button></li>"; /* Delete Event */
+            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal" . $eventID . "'>Delete</button></li>"; /* Delete Event */
 
             echo '</ul>';
         } ?>

public/old/createEvent.php

Spacing +14 added lines, -14 removed lines

@@ -47,7 +47,7 @@ 
 if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) {
     // Just continue the code
 } else {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
 }
 
 if ($userisBandAdmin) {
@@ -84,7 +84,7 @@ 
         $location = $row['location'];
         $locationname = $row['locationname'];
         if ($action == 'edit') {
-            $formaction = '?action=edit&id='.$id;
+            $formaction = '?action=edit&id=' . $id;
         } else {
             $formaction = '';
         }
@@ -138,8 +138,8 @@ 
 
     // convert format of date
     $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy
-    $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00'));
-    $date = $date.' '.$time.':00';
+    $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00'));
+    $date = $date . ' ' . $time . ':00';
     $date = mysqli_real_escape_string(db(), $date);
 
     if ($action == 'edit') {
@@ -209,10 +209,10 @@ 
         //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid=2)";
         //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid!=2)";
         if ($userisBandAdmin) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where groupid in (2,3,4))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where groupid in (2,3,4))';
         }
         if ($userisEventEditor) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where not (groupid in (2,3,4)))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where not (groupid in (2,3,4)))';
         }
         mysqli_query(db(), $delete_all_sql) or exit(mysqli_error(db()));
     }
@@ -220,9 +220,9 @@ 
     // redirect
     if (isset($_SESSION['lastEventsFilter'])) {
         $type = $_SESSION['lastEventsFilter'];
-        header('Location: events.php?view=all&filter='.$type.'#event'.$eventID);
+        header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID);
     } else {
-        header('Location: events.php?view=all#event'.$eventID);
+        header('Location: events.php?view=all#event' . $eventID);
     }
     exit;
 }
@@ -299,7 +299,7 @@ 
                                         while ($ob = mysqli_fetch_object($result)) {
                                             if (!(isset($type) && $ob->id == $type)) {
                                                 $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime));
-                                                echo "<option value='".$ob->id."' title='".$ob->description."' data-time='".($defaultTime == '00:00' ? '' : $defaultTime)."' data-location='".(is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId)."'>".$ob->name.'</option>';
+                                                echo "<option value='" . $ob->id . "' title='" . $ob->description . "' data-time='" . ($defaultTime == '00:00' ? '' : $defaultTime) . "' data-location='" . (is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId) . "'>" . $ob->name . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -325,7 +325,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($subtype) && $row['id'] == $subtype) {
                                             } else {
-                                                echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -353,7 +353,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($location) && $row['id'] == $location) {
                                             } else {
-                                                echo "<option value='".$row['id']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -484,7 +484,7 @@ 
                                     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                         if (isset($type) && $row['id'] == $type) {
                                         } else {
-                                            echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                            echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                         }
                                     } ?>
 								</select>
@@ -554,7 +554,7 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole) { ?>
 											<?php if (!$userRole->getReserve()) { ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
 											<?php } else { ?>
 											<?php $countReserve += 1 ?>
 											<?php } //!userRole->getReserve?>
@@ -565,7 +565,7 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole) { ?>
 											<?php if ($userRole->getReserve()) { ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
 											<?php } ?>
 										<?php } //users?>
 										</optgroup>

public/old/overview.php

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

public/old/tableView.php

Spacing +15 added lines, -15 removed lines

@@ -113,7 +113,7 @@ 
 									 FROM eventTypes et
 									 WHERE id IN (SELECT e.type
 										 						FROM events e
-																WHERE '.$whereTwoMonth.'
+																WHERE '.$whereTwoMonth . '
 																AND e.removed = 0)
 									 ORDER BY name';
         $result = mysqli_query(db(), $filter_sql) or exit(mysqli_error(db()));
@@ -134,7 +134,7 @@ 
 <tr>
 	<td ><strong>Event</strong></td>
 	<?php
-    $sql = 'SELECT * FROM groups g ORDER BY '.$group_sorting_name;
+    $sql = 'SELECT * FROM groups g ORDER BY ' . $group_sorting_name;
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
@@ -164,7 +164,7 @@ 
 
     if ($filter == '') {
         $sql .= '
-							AND '.$whereTwoMonth.'
+							AND '.$whereTwoMonth . '
 						ORDER BY
 							e.date';
     } elseif ($filter == 'all') {
@@ -174,7 +174,7 @@ 
     } elseif ($filter != '') {
         $sql .= "
 							AND e.type = '$filter'
-							AND ".$whereTwoMonth.'
+							AND " . $whereTwoMonth . '
 						ORDER BY
 							e.date';
     }
@@ -188,31 +188,31 @@ 
         echo '<tr>';
         echo '<td >';
         setlocale(LC_TIME, $lang_locale); //de_DE
-        echo '<a href="event.php?id='.$row['id'].'">';
+        echo '<a href="event.php?id=' . $row['id'] . '">';
         echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V
         echo '</a>';
 
         //$row['sundayDate']
         if (!empty($row['eventType'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventType'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventType'] . '</em>';
         }
         if (!empty($row['eventSubType'])) {
-            echo ' - <em>'.$row['eventSubType'].'</em>';
+            echo ' - <em>' . $row['eventSubType'] . '</em>';
         }
         if (!empty($row['eventLocation'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventLocation'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventLocation'] . '</em>';
         }
         if (!empty($row['name'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['name'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['name'] . '</em>';
         }
         if (!empty($row['eventGroup'])) {
-            echo '<br /><strong>&nbsp;&nbsp;&nbsp;'.$row['eventGroup'].'</strong>';
+            echo '<br /><strong>&nbsp;&nbsp;&nbsp;' . $row['eventGroup'] . '</strong>';
         }
         if (!empty($row['sermonTitle'])) {
-            echo ': '.$row['sermonTitle'];
+            echo ': ' . $row['sermonTitle'];
         }
         if (!empty($row['bibleVerse'])) {
-            echo ' <em>('.$row['bibleVerse'].')</em>';
+            echo ' <em>(' . $row['bibleVerse'] . ')</em>';
         }
         echo '</td>';
 
@@ -244,16 +244,16 @@ 
                     if ($previousName == '') {
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } elseif ($previousName != $name) {
                         echo ')</em>';
                         echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : '';
                         echo '<br />'; // line break from previous name
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } else {
-                        echo ', '.$viewPeople['role'];
+                        echo ', ' . $viewPeople['role'];
                     }
 
                     $peopleInEvent = true;

public/old/emails.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;
 }
 
@@ -71,7 +71,7 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            exit('Error: '.mysqli_error(db()));
+            exit('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main page
@@ -88,7 +88,7 @@ 
 
             $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
             if (!mysqli_query(db(), $sql)) {
-                exit('Error: '.mysqli_error(db()));
+                exit('Error: ' . mysqli_error(db()));
             }
         }