TechWilk / rota

public/old/recordingUpload.php

Indentation +8 added lines, -8 removed lines

@@ -34,11 +34,11 @@ 
 
 // get token
 $response = $client->request(
-  'POST',
-  'v3/tokens.json',
-  ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
-                       'email' => siteConfig()['recording']['locomotivecms']['email'], ]]
-  );
+    'POST',
+    'v3/tokens.json',
+    ['form_params' => ['api_key' => siteConfig()['recording']['locomotivecms']['apiKey'],
+                        'email' => siteConfig()['recording']['locomotivecms']['email'], ]]
+    );
 if ($response->getStatusCode() == 201) {
     $token = json_decode($response->getBody())->token;
 }
@@ -46,9 +46,9 @@ 
 // test token
 if (isset($token)) {
     $response = $client->request(
-  'GET',
-  'v3/my_account.json',
-  ['query' => ['auth_token' => $token]]);
+    'GET',
+    'v3/my_account.json',
+    ['query' => ['auth_token' => $token]]);
     var_dump($response);
 } else {
     echo '<p>Unable to connect to main site</p>';

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 // only load page if functionality enabled
 if (siteConfig()['recording']['type'] != 'locomotivecms') {
     echo '<p>This feature is not enabled</p>';
-    echo '<p><a href='.siteSettings()->getSiteUrl().'>&lt; back to homepage</a></p>';
+    echo '<p><a href=' . siteSettings()->getSiteUrl() . '>&lt; back to homepage</a></p>';
     exit;
 }
 
@@ -27,7 +27,7 @@ 
 
 $client = new Client([
     // Base URI is used with relative requests
-    'base_uri' => siteConfig()['recording']['locomotivecms']['url'].'/locomotive/api/',
+    'base_uri' => siteConfig()['recording']['locomotivecms']['url'] . '/locomotive/api/',
     // You can set any number of default request options.
     'timeout'  => 2.0,
 ]);
@@ -52,6 +52,6 @@ 
     var_dump($response);
 } else {
     echo '<p>Unable to connect to main site</p>';
-    echo '<p><a href='.siteSettings()->getSiteUrl().'>&lt; back to homepage</a></p>';
+    echo '<p><a href=' . siteSettings()->getSiteUrl() . '>&lt; back to homepage</a></p>';
     exit;
 }

public/old/emailGroup.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         $statusMessage = 'Sent successfully';
     } else {
         foreach ($sent as $errorMessage) {
-            $statusMessage .= '<p>'.$errorMessage.'</p>';
+            $statusMessage .= '<p>' . $errorMessage . '</p>';
         }
     }
 

public/old/statistics.php

Indentation +6 added lines, -6 removed lines

@@ -139,12 +139,12 @@
     		<tbody>
     		<?php
                 $sql = "SELECT s.date,s.detail1,s.detail2,s.detail3,s.type,trim(concat(u.firstName,' ',u.lastName)) AS name FROM cr_statistics s INNER JOIN cr_users u ON u.id = s.userid";
-          if (!isAdmin()) {
-              $sql .= 'WHERE u.ID=s.userID';
-              if (!$debug) {
-                  $sql .= " AND s.type = 'system'";
-              }
-          }
+            if (!isAdmin()) {
+                $sql .= 'WHERE u.ID=s.userID';
+                if (!$debug) {
+                    $sql .= " AND s.type = 'system'";
+                }
+            }
                 $sql .= ' ORDER BY date desc '.$limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {

Spacing +18 added lines, -18 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;
 }
 
@@ -26,28 +26,28 @@ 
     if ($method == 'truncate') {
         $sql = "CREATE TABLE tmp_system_statistics as SELECT * from cr_statistics WHERE type='system'";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('TRUNCATE TABLE cr_statistics');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('ALTER TABLE cr_statistics  AUTO_INCREMENT = 50');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'INSERT INTO cr_statistics (userid,date,type,detail1,detail2,detail3,script) ';
-        $sql = $sql.'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
+        $sql = $sql . 'SELECT userid,date,type,detail1,detail2,detail3,script from tmp_system_statistics order by date';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'DROP TABLE tmp_system_statistics';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         insertStatistics('system', __FILE__, 'statistics deleted');
@@ -103,22 +103,22 @@ 
               <?php
 
                         $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'];
 
             if (substr($mysqli_version, 0, 1) == 5) {
-                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc ".$browserLimit;
+                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by getBrowserInfo(detail3) order by count desc " . $browserLimit;
             } else {
-                $sql = "SELECT detail3 as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc ".$browserLimit;
+                $sql = "SELECT detail3 as browser,count(*) as count from cr_statistics where detail1 like 'login%' and detail3!='' group by detail3 order by count desc " . $browserLimit;
             }
 
             $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
             while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                 extract($row);
                 echo '<tr>';
-                echo '<td>'.$browser.'</td>';
-                echo '<td>'.$count.'</td>';
+                echo '<td>' . $browser . '</td>';
+                echo '<td>' . $count . '</td>';
                 echo '</tr>';
             } ?>
 
@@ -145,16 +145,16 @@ 
                   $sql .= " AND s.type = 'system'";
               }
           }
-                $sql .= ' ORDER BY date desc '.$limit;
+                $sql .= ' ORDER BY date desc ' . $limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                     extract($row);
                     echo '<tr>';
-                    echo '<td>'.$date.'</td>';
-                    echo '<td>'.$name.'</td>';
-                    echo '<td>'.$type.'</td>';
-                    echo '<td>'.$detail1.'</td>';
-                    echo '<td>'.$detail2.'</td>';
+                    echo '<td>' . $date . '</td>';
+                    echo '<td>' . $name . '</td>';
+                    echo '<td>' . $type . '</td>';
+                    echo '<td>' . $detail1 . '</td>';
+                    echo '<td>' . $detail2 . '</td>';
                     //echo "<td>".$detail3."</td>";
                     echo '</tr>';
                 }

public/old/createEvent.php

Braces +5 added lines, -2 removed lines

@@ -567,7 +567,8 @@ 
 											<?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>
-											<?php else: ?>
+											<?php else {
+    : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -646,4 +647,6 @@ 
   </div><!-- /.createSeries -->
 
 
-<?php include 'includes/footer.php'; ?>
+<?php include 'includes/footer.php';
+}
+?>

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,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) {
@@ -82,7 +82,7 @@ 
         $location = $row['location'];
         $locationname = $row['locationname'];
         if ($action == 'edit') {
-            $formaction = '?action=edit&id='.$id;
+            $formaction = '?action=edit&id=' . $id;
         } else {
             $formaction = '';
         }
@@ -139,8 +139,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') {
@@ -210,10 +210,10 @@ 
         //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid=2)";
         //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid!=2)";
         if ($userisBandAdmin) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
         }
         if ($userisEventEditor) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
         }
         mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db()));
     }
@@ -221,9 +221,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;
 }
@@ -300,7 +300,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>
@@ -326,7 +326,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>
@@ -354,7 +354,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>
@@ -497,7 +497,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>
@@ -567,8 +567,8 @@ 
 										<?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>
-											<?php else: ?>
+											<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 endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -578,7 +578,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 endif ?>
 										<?php endforeach //users?>
 										</optgroup>

public/old/editRole.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 }
 
 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/events.php

Braces +3 added lines, -1 removed lines

@@ -435,8 +435,10 @@
 
                             echo '</li>';
                         }
-        echo '</ul>'; else:
+        echo '</ul>'; else {
+            :
                         echo '<p>No roles assigned to this event.';
+        }
         endif; ?>
 			</div><!-- /.user-roles -->
 		</div><!-- /.box-body -->

Spacing +22 added lines, -22 removed lines

@@ -48,9 +48,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;
 }
 
@@ -70,7 +70,7 @@ 
         session_destroy();
         header('Location: login.php');
     } else {
-        header('Location: events.php?view='.$sessionUserID);
+        header('Location: events.php?view=' . $sessionUserID);
         exit;
     }
 }
@@ -108,11 +108,11 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
         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 page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 
@@ -125,12 +125,12 @@ 
 
             $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) VALUES ('$editeventID', '$editskillID')");
             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 page
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 }
@@ -176,7 +176,7 @@ 
                     $result = mysqli_query(db(), $mysqli_query) or die(mysqli_error(db()));
                     $row = mysqli_fetch_object($result);
 
-                    echo $row->name.'s';
+                    echo $row->name . 's';
                 } elseif ($_SESSION['onlyShowUserEvents'] == '1') {
                     echo 'My Events';
                 } else {
@@ -202,7 +202,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.';
                 } ?>
@@ -270,7 +270,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 die(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>
 				
@@ -416,16 +416,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.
                             }
@@ -451,9 +451,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 */
@@ -462,7 +462,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/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 -->

Indentation +3 added lines, -3 removed lines

@@ -142,10 +142,10 @@
 	</form>
 </div><!-- /.box -->
   <?php
-  if (isAdmin()) {
-      ?>
+    if (isAdmin()) {
+        ?>
   <div id="right">
   		<div class="item"><a href="settings.php">Back to settings</a></div>
 <?php
-  } ?>
+    } ?>
 <?php include 'includes/footer.php'; ?>

public/old/pendingAccounts.php

Indentation +10 added lines, -10 removed lines

@@ -30,24 +30,24 @@
     switch ($_POST['action']) {
     case 'approve':
       $userId = approvePendingUser($id);
-      mailNewUser($userId);
-      header('Location: addUser.php?action=edit&user='.$userId);
-      break;
+        mailNewUser($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);
-      break;
+        $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT);
+        mergePendingUserWithUserId($id, $existingUserId);
+        mailNewUser($existingUserId);
+        header('Location: addUser.php?action=edit&user='.$existingUserId);
+        break;
     case 'decline':
       declinePendingUser($id);
-      break;
+        break;
 
     default:
       // code...
       break;
-  }
+    }
 }
 
 if (empty($id)) {

Switch Indentation +19 added lines, -19 removed lines

@@ -28,25 +28,25 @@
     $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT);
 
     switch ($_POST['action']) {
-    case 'approve':
-      $userId = approvePendingUser($id);
-      mailNewUser($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);
-      break;
-    case 'decline':
-      declinePendingUser($id);
-      break;
-
-    default:
-      // code...
-      break;
+        case 'approve':
+          $userId = approvePendingUser($id);
+          mailNewUser($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);
+          break;
+        case 'decline':
+          declinePendingUser($id);
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

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>