TechWilk / rota

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>

public/old/settings.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -165,7 +165,7 @@ 
 		skin='$skin'";
 
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     header('Location: settings.php');
 }
@@ -192,7 +192,7 @@ 
 	<!-- Content Header (Page header) -->

 	<section class="content-header">

 		<h1>Settings

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

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

 		</h1>

 		<ol class="breadcrumb">

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

public/old/install.php

Spacing +5 added lines, -5 removed lines

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

public/old/error.php

Spacing +1 added lines, -1 removed lines

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

public/old/includes/errors.php

Spacing +1 added lines, -1 removed lines

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

public/old/includes/functions.php

Spacing +20 added lines, -20 removed lines

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