TechWilk / rota

public/old/includes/functions.mail.php

Braces +6 added lines, -2 removed lines

@@ -266,8 +266,10 @@ 
     if (is_array($rotaoutput)):
         foreach ($rotaoutput as $key => $skill):
             $skillfinal = $skillfinal.$skill.' ';
-    endforeach; else:
+    endforeach; else {
+        :
         $skillfinal = $rotaoutput;
+    }
     endif;
     $message = str_replace('[rotaoutput]', $skillfinal, $message);
     $message = str_replace('[siteurl]', $siteurl, $message);
@@ -445,8 +447,10 @@ 
             $roles = [];
             while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) {
                 if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])):
-                    $roles[] = $roleRow['description']; else:
+                    $roles[] = $roleRow['description']; else {
+                        :
                     $roles[] = $roleRow['description'].' - '.$roleRow['name'];
+                    }
                 endif;
             }
 

Spacing +80 added lines, -80 removed lines

@@ -27,12 +27,12 @@ 
 {
     $dbMailId = mailToDb($to, $subject, $message, $from, $bcc);
 
-    $subject = '[rota] '.$subject;
+    $subject = '[rota] ' . $subject;
 
     $message .= "\n\n";
-    $message .= siteSettings()->getOwner()."\n";
-    $message .= 'Mail generated with ChurchRota V.'.siteSettings()->getVersion()."\n";
-    $message .= siteSettings()->getSiteUrl()."\n";
+    $message .= siteSettings()->getOwner() . "\n";
+    $message .= 'Mail generated with ChurchRota V.' . siteSettings()->getVersion() . "\n";
+    $message .= siteSettings()->getSiteUrl() . "\n";
 
     $mailSentOk = false;
 
@@ -76,14 +76,14 @@ 
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
     //spaces to suppress automatic removal of "unnecessary linefeeds" in outlook 2003
     $crlf = "      \n";
-    $message = str_replace("\r\n", $crlf, $message);  //replace crlf's
+    $message = str_replace("\r\n", $crlf, $message); //replace crlf's
 
     //--------------------------------------------------------------------------------
-    $headers = 'From: '.$from.$crlf.
-    'Reply-To: '.$from.$crlf.
-    'Mime-Version: 1.0'.$crlf.
-    'Content-Type: text/plain; charset=ISO-8859-1'.$crlf;
-    'Content-Transfer-Encoding: quoted-printable'.$crlf;
+    $headers = 'From: ' . $from . $crlf .
+    'Reply-To: ' . $from . $crlf .
+    'Mime-Version: 1.0' . $crlf .
+    'Content-Type: text/plain; charset=ISO-8859-1' . $crlf;
+    'Content-Transfer-Encoding: quoted-printable' . $crlf;
     $headerSimple = $headers;
 
     //--------------------------------------------------------------------------------
@@ -92,8 +92,8 @@ 
     $to = str_replace(';', ',', $to);
 
     if ($mail_dbg) {
-        $subject = ' - Mail Debug: '.$subject;   //debug output
-        $message .= $crlf.'To: '.$to.$crlf;   //debug move to to end of message
+        $subject = ' - Mail Debug: ' . $subject; //debug output
+        $message .= $crlf . 'To: ' . $to . $crlf; //debug move to to end of message
     }
 
     //--------------------------------------------------------------------------------
@@ -105,13 +105,13 @@ 
     foreach ($teile as $adr) {
         if (preg_replace("/([a-zA-Z0-9._%+-]+)(@)([a-zA-Z0-9.-]+)(\.)([a-zA-Z]+)/i", '# # #', trim($adr)) == '# # #') {
             if ($mail_dbg) {
-                $message .= 'Bcc: '.trim($adr).$crlf;
+                $message .= 'Bcc: ' . trim($adr) . $crlf;
             } else {
-                $headers .= 'Bcc: '.trim($adr).$crlf;
+                $headers .= 'Bcc: ' . trim($adr) . $crlf;
             }
             $i = $i + 1;
         } else {
-            $bcc_err .= $adr.$crlf;
+            $bcc_err .= $adr . $crlf;
             $err .= +1;
         }
     }
@@ -144,10 +144,10 @@ 
         if ($mailOk) {
             //mail($from, "[ChurchRota] Mail status - OK", "address ok: " . $i, $headerSimple);
         } else {
-            mail($from, '[Rota] Mail status - ERROR', 'to: '.$to.$crlf.'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple);
+            mail($from, '[Rota] Mail status - ERROR', 'to: ' . $to . $crlf . 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple);
 
             return false;
-            logFailedMailWithId($dbMailId, 'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple);
+            logFailedMailWithId($dbMailId, 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple);
         }
     }
 
@@ -204,9 +204,9 @@ 
         }
         $categoryname = $row['categoryname'];
         $to = $row['email'];
-        $subject = 'New post: '.$objectname;
+        $subject = 'New post: ' . $objectname;
 
-        $finalmessage = 'Dear '.$postname."\n \n".$message.$objectname."\n \n".
+        $finalmessage = 'Dear ' . $postname . "\n \n" . $message . $objectname . "\n \n" .
         'To see the post, please login using your username and password';
 
         sendMail($to, $subject, $finalmessage, $row['siteadmin']);
@@ -226,19 +226,19 @@ 
 
     $message = siteSettings()->getNewUserMessage();
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
     $message = str_replace('[name]', $name, $message);
     $message = str_replace('[username]', $user->username, $message);
     $message = str_replace('[password]', $password, $message);
     $message = str_replace('[siteurl]', siteSettings()->getSiteUrl(), $message);
 
-    $subject = 'Account created for '.$name;
+    $subject = 'Account created for ' . $name;
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>';
 
     sendMail($to, $subject, $message, $from);
-    sendMail($from, 'ADMIN COPY: '.$subject, $message, $from);
+    sendMail($from, 'ADMIN COPY: ' . $subject, $message, $from);
 }
 
 function parseEmailTemplate($message, $values)
@@ -249,7 +249,7 @@ 
     $values['siteemail'] = siteSettings()->getAdminEmailAddress();
 
     foreach ($values as $template_field => $value) {
-        $message = str_ireplace('['.$template_field.']', trim($value), $message);
+        $message = str_ireplace('[' . $template_field . ']', trim($value), $message);
     }
     $message = trim($message);
 
@@ -265,7 +265,7 @@ 
     $message = str_replace('[rehearsal]', $rehearsal, $message);
     if (is_array($rotaoutput)):
         foreach ($rotaoutput as $key => $skill):
-            $skillfinal = $skillfinal.$skill.' ';
+            $skillfinal = $skillfinal . $skill . ' ';
     endforeach; else:
         $skillfinal = $rotaoutput;
     endif;
@@ -283,7 +283,7 @@ 
 function notifyIndividual($userID, $eventID, $skillID)
 {
     notifyEveryoneForEvent($eventID, $skillID, $userID);
-    $eventID = 0;  //disables following code through empty sql result
+    $eventID = 0; //disables following code through empty sql result
 
     $sql = "SELECT *,
 	(SELECT CONCAT(`firstname`, ' ', `lastname`) FROM users WHERE `users`.id = `skills`.`userID` ORDER BY `users`.firstname) AS `name`,
@@ -324,13 +324,13 @@ 
             if (($row['eventRehearsal'] == '0') or ($row['eventRehearsalChange'] == '1')) {
                 $rehearsal = $row['norehearsalemail'];
             } else {
-                $rehearsal = $row['yesrehearsal'].' on '.$rehearsaldate.' at '.$location;
+                $rehearsal = $row['yesrehearsal'] . ' on ' . $rehearsaldate . ' at ' . $location;
             }
         }
 
         $skill = $row['category'];
         if ($row['joinedskill'] != '') {
-            $skill = $skill.' - '.$row['joinedskill'];
+            $skill = $skill . ' - ' . $row['joinedskill'];
         } else {
             // If there is no skill, then we don't need to mention this fact.
         }
@@ -346,7 +346,7 @@ 
         $location = $row['eventLocationFormatted'];
         $rotaoutput = $skill;
         $to = $row['email'];
-        $subject = 'Rota reminder: '.$date;
+        $subject = 'Rota reminder: ' . $date;
 
         $message = emailTemplate($message, $name, $date, $location, $rehearsal, $rotaoutput, $username, $siteurl);
 
@@ -417,9 +417,9 @@ 
 
                 $type = $ob->eventType;
 
-                $eventdetails = $eventrow['eventGroup'].': '.$eventrow['sermonTitle'];
+                $eventdetails = $eventrow['eventGroup'] . ': ' . $eventrow['sermonTitle'];
                 if (!empty($eventrow['bibleVerse'])) {
-                    $eventdetails .= ' ('.$eventrow['bibleVerse'].')';
+                    $eventdetails .= ' (' . $eventrow['bibleVerse'] . ')';
                 }
             }
 
@@ -442,7 +442,7 @@ 
             while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) {
                 if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])):
                     $roles[] = $roleRow['description']; else:
-                    $roles[] = $roleRow['description'].' - '.$roleRow['name'];
+                    $roles[] = $roleRow['description'] . ' - ' . $roleRow['name'];
                 endif;
             }
 
@@ -462,11 +462,11 @@ 
             $message = siteSettings()->getNotificationEmail();
             $rotaoutput = implode(', ', $roles);
 
-            $to = $ob->name.' <'.$ob->email.'>';
-            $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>';
+            $to = $ob->name . ' <' . $ob->email . '>';
+            $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>';
 
             //$subject = "Rota reminder: " . $date;
-            $subject = 'Reminder: '.implode(', ', $roles).' - '.$type.': '.$date;
+            $subject = 'Reminder: ' . implode(', ', $roles) . ' - ' . $type . ': ' . $date;
 
             $rotadetails = getEventDetails($eventId, "\r\n", 0, false, "\t");
 
@@ -501,7 +501,7 @@ 
 							ep.notified = 1
 						WHERE
 							ep.eventId = '$eventId'
-							AND ur.userId IN (".implode(', ', $countarray).')';
+							AND ur.userId IN (" . implode(', ', $countarray) . ')';
 
         mysqli_query(db(), $sql) or die(mysqli_error(db()));
     }
@@ -530,14 +530,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->recieveReminderEmails) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve reminder emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve reminder emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -570,7 +570,7 @@ 
     $eventDetails .= ' - ';
     $eventDetails .= "\r\n";
     $eventDetails .= $event->type;
-    $eventDetails .= $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')';
+    $eventDetails .= $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')';
     $eventDetails .= "\r\n";
     $eventDetails .= "\r\n";
 
@@ -594,7 +594,7 @@ 
         'event.type'     => $event->type,
         'event.location' => $event->location,
 
-        'event.sermon'        => $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')',
+        'event.sermon'        => $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')',
         'event.sermon.name'   => $event->sermonTitle,
         'event.sermon.series' => $event->eventGroup,
         'event.sermon.verse'  => $event->bibleVerse,
@@ -608,8 +608,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteSettings()->getAdminEmailAddress().'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteSettings()->getAdminEmailAddress() . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -617,10 +617,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 function getEventEmailSubject($eventId)
@@ -667,16 +667,16 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $groupNames = '';
     while ($group = mysqli_fetch_object($result)) {
-        $groupNames .= $group->name.', ';
+        $groupNames .= $group->name . ', ';
     }
 
     if (isset($errors)) {
-        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames.' groups with errors: '.implode(', ', $errors), 'email');
+        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . ' groups with errors: ' . implode(', ', $errors), 'email');
 
         return $errors;
     }
 
-    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email');
+    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email');
 
     return $true;
 }
@@ -728,16 +728,16 @@ 
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
     $groupNames = '';
     while ($group = mysqli_fetch_object($result)) {
-        $groupNames .= $group->name.', ';
+        $groupNames .= $group->name . ', ';
     }
 
     if (isset($errors)) {
-        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames." groups with errors: \n- ".implode("\n- ", $errors), 'email');
+        createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . " groups with errors: \n- " . implode("\n- ", $errors), 'email');
 
         return $errors;
     }
 
-    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email');
+    createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email');
 
     return $true;
 }
@@ -753,14 +753,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->isOverviewRecipient) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve group emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -823,8 +823,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteadmin.'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -832,10 +832,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 // returns either true, or error message string
@@ -848,14 +848,14 @@ 
     $user = mysqli_fetch_object($result);
 
     if (!$user->email) {
-        return 'No email address present for '.$user->firstName.' '.$user->lastName;
+        return 'No email address present for ' . $user->firstName . ' ' . $user->lastName;
     }
 
     if (!$user->isOverviewRecipient) {
-        return $user->firstName.' '.$user->lastName.' opted not to recieve group emails';
+        return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails';
     }
 
-    $name = $user->firstName.' '.$user->lastName;
+    $name = $user->firstName . ' ' . $user->lastName;
 
     //line seperator for mails
     //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird.
@@ -888,7 +888,7 @@ 
     }
 
     if (!isset($events)) {
-        return $name.' has no events in the upcoming rota';
+        return $name . ' has no events in the upcoming rota';
     }
 
     $events = implode(', ', $events);
@@ -941,7 +941,7 @@ 
 
         $eventDetails .= $row['joinedskills'];
         $eventDetails .= "\r\n";
-        $eventDetails .= 'Notes: '.$row['comment'];
+        $eventDetails .= 'Notes: ' . $row['comment'];
         $eventDetails .= "\r\n";
         $eventDetails .= "\r\n";
     }
@@ -957,8 +957,8 @@ 
 
     //$message = str_replace("\r\n",$crlf,$message);
 
-    $to = $name.' <'.$user->email.'>';
-    $from = siteSettings()->getOwner().' <'.$siteadmin.'>';
+    $to = $name . ' <' . $user->email . '>';
+    $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>';
 
     $sent = false;
     $sent = sendMail($to, $subject, $message, $from);
@@ -966,10 +966,10 @@ 
     if ($sent == true) {
         return true;
     } else {
-        return 'Error while sending mail to '.$user->firstName.' '.$user->lastName;
+        return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName;
     }
 
-    return 'Unknown error for '.$user->firstName.' '.$user->lastName;
+    return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName;
 }
 
 function notifyAttack($fileName, $attackType, $attackerID)
@@ -984,10 +984,10 @@ 
 
     while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) {
         $subject = 'SECURITY-ALERT - Attack blocked successfully';
-        $message = "Type:\t\t ".$attackType."<br>\r\n".
-                    "Attacker:\t ".$row[name]."<br>\r\n".
-                    "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n".
-                    "Script:\t\t ".$fileName."\r\n "."<br>\r\n";
+        $message = "Type:\t\t " . $attackType . "<br>\r\n" .
+                    "Attacker:\t " . $row[name] . "<br>\r\n" .
+                    "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" .
+                    "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n";
 
         //$headers = 'From: ' . $row['siteadmin'] . "\r\n" .
         //'Reply-To: ' . $row['siteadmin'] . "\r\n";
@@ -997,8 +997,8 @@ 
         //mail($to, $subject, strip_tags($message), $headers);
         sendMail($to, $subject, strip_tags($message), $to);
 
-        echo $subject.'<br><br>';
-        echo $message.'<br>';
+        echo $subject . '<br><br>';
+        echo $message . '<br>';
         echo 'An email about this incident was sent to administrator!';
     }
 }
@@ -1013,11 +1013,11 @@ 
     $userresult = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) {
-        $subject = 'Info - '.$infoMsg.' - '.$row[name];
-        $message = "Type:\t\t ".$infoMsg."<br>\r\n".
-                    "User:\t\t ".$row[name]."<br>\r\n".
-                    "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n".
-                    "Script:\t\t ".$fileName."\r\n "."<br>\r\n";
+        $subject = 'Info - ' . $infoMsg . ' - ' . $row[name];
+        $message = "Type:\t\t " . $infoMsg . "<br>\r\n" .
+                    "User:\t\t " . $row[name] . "<br>\r\n" .
+                    "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" .
+                    "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n";
 
         //$headers = 'From: ' . $row['siteadmin'] . "\r\n" .
         //'Reply-To: ' . $row['siteadmin'] . "\r\n";
@@ -1034,7 +1034,7 @@ 
     if (preg_match("/(\{\{)((.)+){1}(\}\})/", $message, $matches) == 1) {
         $defaultSubject = $matches[2];
         //$subject = str_replace(array("{{","}}"),"",$matches[0]);
-        $message = str_replace($matches[1].$matches[2].$matches[4], '', $message);
+        $message = str_replace($matches[1] . $matches[2] . $matches[4], '', $message);
         //$message = $matches[4];
 
         //$message = $message . "\r\n\r\n";

public/old/includes/functions.discussion.php

Indentation +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         '#(http://(www.)?youtube.com)?/(v/|watch\?v\=)([-|~_0-9A-Za-z]+)&?.*?#i',
         '<iframe title="YouTube Video" width="560" height="340" src="http://www.youtube.com/embed/$4" frameborder="0" allowfullscreen></iframe>',
     $string
-  );
+    );
 
     return $string;
 }

public/old/includes/functions.notifications.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     7 => 'swap-pending',
     8 => 'swap-approved',
     9 => 'email',
-  ];
+    ];
 }
 
 function createNotificationForUser($userId, $summary, $body, $typeName, $link = null)

public/old/email.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     case 'everyone':
       echo '<p>Function not complete, please wait while we finish writing it.</p><p>Apologies for any inconvinence.</p>';
         break;
-  default:
+    default:
     echo '<p>Error: Insufficient parameters.</p>';
     echo '<p>Please inform the system administrator</p>';
     break;

public/old/linkSocialAuth.php

Switch Indentation +11 added lines, -11 removed lines

@@ -37,22 +37,22 @@
     $platform = strtolower($_POST['platform']);
 
     switch ($_POST['action']) {
-    case 'link':
-      switch ($platform) {
+        case 'link':
+          switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
           header('Location: fb-login.php');
           exit;
-      }
-      break;
-    case 'unlink':
-      removeSocialAuthFromUserWithId($id, $platform);
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
-      break;
-
-    default:
-      // code...
+          }
       break;
+        case 'unlink':
+          removeSocialAuthFromUserWithId($id, $platform);
+          createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
+          break;
+
+        default:
+          // code...
+          break;
   }
 }
 

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
       break;
     case 'unlink':
       removeSocialAuthFromUserWithId($id, $platform);
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
+      createNotificationForUser($id, ucfirst($platform) . ' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
       break;
 
     default:

Braces +5 added lines, -2 removed lines

@@ -106,14 +106,17 @@
       <input type="hidden" name="action" value="unlink" />
       <button class="btn btn-danger">Unlink</button>
     </form>
-    <?php else: ?>
+    <?php else {
+    : ?>
     <form action="#" method="post">
       <input type="hidden" name="id" value="<?php echo $id ?>" />
       <input type="hidden" name="platform" value="<?php echo $platform ?>" />
       <input type="hidden" name="action" value="link" />
       <button class="btn btn-primary">Link</button>
     </form>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
   </div>
 </div>
 <?php endforeach; ?>

Indentation +7 added lines, -7 removed lines

@@ -41,19 +41,19 @@
       switch ($platform) {
         case 'facebook':
           $_SESSION['fb-callback-url'] = 'fb-link.php';
-          header('Location: fb-login.php');
-          exit;
-      }
-      break;
+            header('Location: fb-login.php');
+            exit;
+        }
+        break;
     case 'unlink':
       removeSocialAuthFromUserWithId($id, $platform);
-      createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
-      break;
+        createNotificationForUser($id, ucfirst($platform).' account unlinked', 'You have successfully unlinked your Facebook account.  Login via Facebook is now disabled for your account.  Feel free to relink your account at any time.', 'account', 'linkSocialAuth.php');
+        break;
 
     default:
       // code...
       break;
-  }
+    }
 }
 
 // list of possible social account links (names used as platform names in database)

public/old/index.php

Braces +12 added lines, -4 removed lines

@@ -323,8 +323,10 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                  else {
+                      :
                     echo '<p>No roles assigned to this event.';
+                  }
                   endif;
                 ?>
                 </div>
@@ -353,7 +355,8 @@ 
         <a href="events.php?view=all" class="btn btn-primary">view all events</a>
       </div>
 
-      <?php else: ?>
+      <?php else {
+    : ?>
       <p>There are no events this week. <a href="events.php?view=all">View all events</a></p>
       <?php endif ?>
 
@@ -374,6 +377,7 @@ 
 
         <?php // Month separators
         $newMonth = strftime('%B %Y', strtotime($event->date));
+}
         if ($month != $newMonth):
         $month = $newMonth;
         ?>
@@ -500,8 +504,10 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                  else {
+                      :
                     echo '<p>No roles assigned to this event.';
+                  }
                   endif;
                 ?>
                 </div>
@@ -527,7 +533,8 @@ 
         <?php endforeach ?>
       </ul>
 
-      <?php else: ?>
+      <?php else {
+    : ?>
       <p>You have no events on the upcoming rota. <a href="events.php">View all events</a></p>
       <?php endif ?>
 
@@ -649,6 +656,7 @@ 
               <a href="addUser.php?action=edit">
                 <?php
                 $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>

Indentation +48 added lines, -48 removed lines

@@ -177,10 +177,10 @@ 
     <div class="col-sm-8 col-md-8 col-lg-6">
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~ Events this week ~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~ Events this week ~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>Events this week:</h2>
 
@@ -204,17 +204,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>
@@ -269,7 +269,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`,
@@ -285,13 +285,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(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)) {
@@ -324,9 +324,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </div>
                 <div class="modal-footer">
@@ -360,10 +360,10 @@ 
 
 
       <?php
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      // ~~~~~~~~~ User's events ~~~~~~~~~~
-      // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-      ?>
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        // ~~~~~~~~~ User's events ~~~~~~~~~~
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ?>
 
       <h2>My events:</h2>
 
@@ -388,9 +388,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>
@@ -446,7 +446,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`,
@@ -462,13 +462,13 @@ 
                                   AND ep.removed = 0
                                 ORDER BY g.name, r.name";
 
-                  $resultPeople = mysqli_query(db(), $sqlPeople) or die(mysqli_error(db()));
-                  $groupName = '';
-                  $groupId = 0;
-                  $identifier = '1';
-                  $firstTime = true;
+                    $resultPeople = mysqli_query(db(), $sqlPeople) or die(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)) {
@@ -501,9 +501,9 @@ 
                         echo '</li>';
                     }
                     echo '</ul>';
-                  else:
+                    else:
                     echo '<p>No roles assigned to this event.';
-                  endif;
+                    endif;
                 ?>
                 </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 +13 added lines, -13 removed lines

@@ -221,7 +221,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()): ?>
@@ -281,7 +281,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";
 
@@ -306,16 +306,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.
                         }
@@ -397,7 +397,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 != ''): ?>
@@ -458,7 +458,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.
                         }
@@ -563,7 +563,7 @@ 
                   ">
                   <?php echo timeInWordsWithTense($event->getDate()) ?>
                 </span>
-                <?php else: ?>
+                <?php else : ?>
                 <span class="pull-right badge bg-red">
                   never
                 </span>
@@ -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/logout.php

Indentation +7 added lines, -7 removed lines

@@ -5,18 +5,18 @@
 include 'includes/config.php';
 include 'includes/functions.php';
 
- // you have to open the session first
- session_start();
+    // you have to open the session first
+    session_start();
 
     //if ($debug) notifyInfo(__FILE__,"logout",$_SESSION['userid']);	//only_for_testing//
     if ($debug) {
         insertStatistics('user', __FILE__, 'logout');
     }
 
- //remove all the variables in the session
- session_unset();
+    //remove all the variables in the session
+    session_unset();
 
- // destroy the session
- session_destroy();
+    // destroy the session
+    session_destroy();
 
- header('Location: login.php');
+    header('Location: login.php');

public/index.php

Spacing +7 added lines, -7 removed lines

@@ -6,31 +6,31 @@
     // To help the built-in PHP dev server, check if the request was actually for
     // something which should probably be served as a static file
     $url = parse_url($_SERVER['REQUEST_URI']);
-    $file = __DIR__.$url['path'];
+    $file = __DIR__ . $url['path'];
     if (is_file($file)) {
         return false;
     }
 }
 
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 // setup Propel (autoload configured though composer)
-require_once __DIR__.'/../generated-conf/config.php';
+require_once __DIR__ . '/../generated-conf/config.php';
 
 session_start();
 
 // Instantiate the app
-$settings = require __DIR__.'/../src/settings.php';
+$settings = require __DIR__ . '/../src/settings.php';
 $app = new \Slim\App($settings);
 
 // Set up dependencies
-require __DIR__.'/../src/dependencies.php';
+require __DIR__ . '/../src/dependencies.php';
 
 // Register middleware
-require __DIR__.'/../src/middleware.php';
+require __DIR__ . '/../src/middleware.php';
 
 // Register routes
-require __DIR__.'/../src/routes.php';
+require __DIR__ . '/../src/routes.php';
 
 // Run app
 $app->run();

generated-migrations/PropelMigration_1494860053.php

Indentation +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function getUpSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;
@@ -172,7 +172,7 @@ 
     public function getDownSQL()
     {
         return [
-  'default' => '
+    'default' => '
 # This is a fix for InnoDB in MySQL >= 4.1.x
 # It "suspends judgement" for fkey relationships until are tables are set.
 SET FOREIGN_KEY_CHECKS = 0;