TechWilk / rota

public/old/includes/functions.mail.php

Spacing +82 added lines, -82 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 cr_users WHERE `cr_users`.id = `cr_skills`.`userID` ORDER BY `cr_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);
 
@@ -421,9 +421,9 @@ 
                     $comment = '-';
                 }
 
-                $eventdetails = $eventrow['eventGroup'].': '.$eventrow['sermonTitle'];
+                $eventdetails = $eventrow['eventGroup'] . ': ' . $eventrow['sermonTitle'];
                 if (!empty($eventrow['bibleVerse'])) {
-                    $eventdetails .= ' ('.$eventrow['bibleVerse'].')';
+                    $eventdetails .= ' (' . $eventrow['bibleVerse'] . ')';
                 }
             }
 
@@ -446,7 +446,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;
             }
 
@@ -466,11 +466,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");
 
@@ -506,7 +506,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()));
     }
@@ -535,14 +535,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.
@@ -576,9 +576,9 @@ 
     $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 .= 'Notes: '.$event->comment;
+    $eventDetails .= 'Notes: ' . $event->comment;
     $eventDetails .= "\r\n";
     $eventDetails .= "\r\n";
 
@@ -603,7 +603,7 @@ 
         'event.location' => $event->location,
         'event.comment'  => $event->comment,
 
-        '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,
@@ -617,8 +617,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);
@@ -626,10 +626,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)
@@ -676,16 +676,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;
 }
@@ -737,16 +737,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;
 }
@@ -762,14 +762,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.
@@ -816,7 +816,7 @@ 
 
     $eventDetails .= $ob->roles;
     $eventDetails .= "\r\n";
-    $eventDetails .= 'Notes: '.$ob->comment;
+    $eventDetails .= 'Notes: ' . $ob->comment;
     $eventDetails .= "\r\n";
     $eventDetails .= "\r\n";
 
@@ -835,8 +835,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);
@@ -844,10 +844,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
@@ -860,14 +860,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.
@@ -900,7 +900,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);
@@ -955,7 +955,7 @@ 
 
         $eventDetails .= $row['joinedskills'];
         $eventDetails .= "\r\n";
-        $eventDetails .= 'Notes: '.$row['comment'];
+        $eventDetails .= 'Notes: ' . $row['comment'];
         $eventDetails .= "\r\n";
         $eventDetails .= "\r\n";
     }
@@ -971,8 +971,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);
@@ -980,10 +980,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)
@@ -998,10 +998,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";
@@ -1011,8 +1011,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!';
     }
 }
@@ -1027,11 +1027,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";
@@ -1048,7 +1048,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/addUser.php

Indentation +24 added lines, -24 removed lines

@@ -84,7 +84,7 @@ 
 // If the form has been submitted, then we need to handle the data.
 if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
-  // sanitise inputs
+    // sanitise inputs
     if (isAdmin()) {
         $firstname = $_POST['firstname'];
         $firstname = strip_tags($firstname);
@@ -257,8 +257,8 @@ 
           <div class="box-body">
 
     			<?php
-          // if isAdmin() == false
-          // ordered in this way to build the page with contact details before permissions
+            // if isAdmin() == false
+            // ordered in this way to build the page with contact details before permissions
                 if (!isAdmin()) {
                     if ($userId == $sessionUserID) {
                         echo $firstname.' '.$lastname;
@@ -304,15 +304,15 @@ 
 
 					<?php
 
-          if (isAdmin()) {
-              ?>
+            if (isAdmin()) {
+                ?>
 
           <div class="checkbox">
       			<label for="isAdmin">
               <input name="isAdmin" id="isAdmin" type="checkbox" value="1" <?php if ($userisAdmin == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userisAdmin == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userisAdmin == '0') {
+                } ?> />
               Make them an ADMIN?:
             </label>
           </div>
@@ -320,9 +320,9 @@ 
           <div class="checkbox">
       			<label for="isBandAdmin">
               <input class="checkbox" name="isBandAdmin" id="isBandAdmin" type="checkbox" value="1" <?php if ($userisBandAdmin == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userisBandAdmin == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userisBandAdmin == '0') {
+                } ?> />
               Make them a BAND admin?:
             </label>
           </div>
@@ -330,9 +330,9 @@ 
           <div class="checkbox">
       			<label for="isEventEditor">
         			<input class="checkbox" name="isEventEditor" id="isEventEditor" type="checkbox" value="1" <?php if ($userIsEventEditor == '1') {
-                  echo 'checked="checked"';
-              } elseif ($userIsEventEditor == '0') {
-              } ?> />
+                    echo 'checked="checked"';
+                } elseif ($userIsEventEditor == '0') {
+                } ?> />
               Make them an EVENT EDITOR?:
             </label>
           </div>
@@ -340,14 +340,14 @@ 
 					<hr />
 
 					<?php
-          } ?>
+            } ?>
 
           <div class="checkbox">
       			<label for="isOverviewRecipient">
         			<input class="checkbox" <?php echo isAdmin() ? '' : 'disabled="disabled"' ?> name="isOverviewRecipient" id="isOverviewRecipient" type="checkbox" value="1" <?php if ($userIsOverviewRecipient == '1' || is_null($userIsOverviewRecipient)) {
-              echo 'checked="checked"';
-          } elseif ($userIsOverviewRecipient == '0') {
-          }?> />
+                echo 'checked="checked"';
+            } elseif ($userIsOverviewRecipient == '0') {
+            }?> />
               Receive group emails?:
             </label>
           </div>
@@ -355,9 +355,9 @@ 
 					<div class="checkbox">
       			<label for="isReminderRecipient">
         			<input class="checkbox" disabled= "disabled" name="isReminderRecipient" id="isReminderRecipient" type="checkbox" value="1" <?php if (true/*$userIsReminderRecipient == '1' || is_null($userIsReminderRecipient)*/) {
-              echo 'checked="checked"';
-          } elseif (true/*$userIsReminderRecipient*/ == '0') {
-          }?> />
+                echo 'checked="checked"';
+            } elseif (true/*$userIsReminderRecipient*/ == '0') {
+            }?> />
               Receive email reminders?: (optional in future update to system)
             </label>
           </div>
@@ -447,18 +447,18 @@ 
                 } else {
                     echo '<input class="btn btn-primary" type="submit" value="Add user" />';
                 }
-         ?>
+            ?>
 		</div><!-- /.box-footer -->
   	</form>
   </div>
 </div>
 <div id="right">
 <?php if (isAdmin()) {
-             ?>
+                ?>
 
 		<div class="item"><a class="btn" href="users.php">View all users</a></div>
 		<?php
-         }
+            }
 
             if ($action == 'edit') {
                 ?>

public/old/fb-signup.php

Indentation +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@
 }
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $accessToken = $_SESSION['fb_access_token'];
 $_SESSION['foo'] = 'bar';

Spacing +3 added lines, -3 removed lines

@@ -41,10 +41,10 @@ 
     // Returns a `Facebook\FacebookResponse` object
     $response = $fb->get('/me?fields=id,name,email', $accessToken);
 } catch (Facebook\Exceptions\FacebookResponseException $e) {
-    echo 'Graph returned an error: '.$e->getMessage();
+    echo 'Graph returned an error: ' . $e->getMessage();
     exit;
 } catch (Facebook\Exceptions\FacebookSDKException $e) {
-    echo 'Facebook SDK returned an error: '.$e->getMessage();
+    echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
 }
 
@@ -91,7 +91,7 @@ 
             <label class="fa fa-envelope-o" for="email"><span class="hidden">Email address</span></label>
             <input name="email" id="email" type="text" class="form__input" placeholder="Email address" value="<?php echo $user->getEmail(); ?>" required>
           </div>
-					<?php if (!empty($message)): echo '<p>'.$message.'</p>'; endif; ?>
+					<?php if (!empty($message)): echo '<p>' . $message . '</p>'; endif; ?>
           <div class="form__field">
             <input type="submit" value="Request access">
           </div>

public/old/series.php

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

Spacing +8 added lines, -8 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;
 }
 
@@ -34,7 +34,7 @@ 
 if ($role && $assignTo) {
     $sql = "UPDATE cr_roles r SET r.groupId = '$assignTo' WHERE r.id = '$role'";
     if (!mysqli_query(db(), $sql)) {
-        die('Error: '.mysqli_error(db()));
+        die('Error: ' . mysqli_error(db()));
     }
     header('Location: roles.php');
     exit;
@@ -70,7 +70,7 @@ 
         $sql = "INSERT INTO cr_roles (name, description, rehersalId, groupId)
             VALUES ('$newrole', '$newrole', $rehersal, $groupId)";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } elseif ($method == 'newgroup') {
         $groupId = $_POST['groups'];
@@ -86,7 +86,7 @@ 
         $sql = "INSERT INTO cr_groups (name, description)
             VALUES ('$newgroup', '$newgroup')";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         // Handle renaming of the roles
@@ -119,11 +119,11 @@ 
     $i = 1;
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         if ($type == 'option') {
-            $list = $list."<option value='".$row['id']."'>".$row['name'].'</option>';
+            $list = $list . "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
         } elseif ($type == 'li') {
-            $list = $list.'<li>'.$row['name'].'</li>';
+            $list = $list . '<li>' . $row['name'] . '</li>';
         } elseif ($type == 'li-a') {
-            $list = $list."<li><a href='roles.php?role=".$roleId.'&assignto='.$row['id']."'>".$row['name'].'</a></li>';
+            $list = $list . "<li><a href='roles.php?role=" . $roleId . '&assignto=' . $row['id'] . "'>" . $row['name'] . '</a></li>';
         }
         $i++;
     }
@@ -189,7 +189,7 @@ 
             $group = $row['groupId'];
             $down = $group + 1;
             $up = $group - 1;
-            echo '<div><strong>'.$groupname.'</strong><br />';
+            echo '<div><strong>' . $groupname . '</strong><br />';
         }
         // Print text input box if a role exists for the group.
         // Allows user to update role names and move roles between groups

public/old/discussion.php

Indentation +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
         } ?></h2>
 			<p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p>
 			 <?php 
-             $latestpostsql = "SELECT *, 
+                $latestpostsql = "SELECT *, 
 		(SELECT CONCAT(`firstname`, ' ', `lastname`) FROM cr_users WHERE `cr_users`.id = `cr_discussion`.`userID` ) AS `name`, 
 		(SELECT id FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC LIMIT 0,1) AS `postid`,
 		(SELECT DATE_FORMAT(date,'%W, %M %e @ %h:%i %p') FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC 
@@ -212,7 +212,7 @@ 
 </div>
 <?php
     } // End the admin loop
- ?>
+    ?>
 <div id="right">
 		<?php echo $subscribe;
 

Spacing +10 added lines, -10 removed lines

@@ -52,10 +52,10 @@ 
 
 if ($subscribe == 'true') {
     subscribeto($userID, $areaid, 0);
-    header('Location: discussion.php?categoryid='.$areaid);
+    header('Location: discussion.php?categoryid=' . $areaid);
 } elseif ($subscribe == 'false') {
     unsubscribefrom($subscription);
-    header('Location: discussion.php?categoryid='.$areaid);
+    header('Location: discussion.php?categoryid=' . $areaid);
 }
 
 // If the form has been sent, we need to handle the data.
@@ -66,7 +66,7 @@ 
 
     $sql = ("INSERT INTO cr_discussionCategories(name, description, parent) VALUES ('$categoryname', '$categorydescription', '$categoryparent')");
     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
@@ -90,7 +90,7 @@ 
         $categoryName = $row['name'];
 
         // The following function lists the parents here to save a SQL query later
-        $listParents = $listParents."<option value='".$categoryID."'>".$categoryName.'</option>'; ?>
+        $listParents = $listParents . "<option value='" . $categoryID . "'>" . $categoryName . '</option>'; ?>
 		<div class="elementBackground highlight">
 			<h2><a href="discussion.php?categoryid=<?php echo $categoryID; ?>"><?php echo $row['name']; ?></a> <?php 
             if (isAdmin()) {
@@ -110,7 +110,7 @@ 
                 } else {
                     $topicName = $row['topicName'];
                 } ?>
-			<p><strong>Latest post:</strong> <?php echo $topicName.' <strong>by</strong> '.$row['firstName']; ?></p>
+			<p><strong>Latest post:</strong> <?php echo $topicName . ' <strong>by</strong> ' . $row['firstName']; ?></p>
             <?php
             } ?>
 		
@@ -144,7 +144,7 @@ 
 		<div class="elementBackground">
 			<h2><a href="discussiontopic.php?id=<?php echo $row['id']; ?>&parentid=<?php echo $categoryID; ?>"><?php echo $row['topicName']; ?></a>
 			<?php if (isAdmin()) {
-            echo "<a href='discussion.php?discussionremove=true&categoryid=".$row['id']."'><img src='graphics/close.png' /></a>";
+            echo "<a href='discussion.php?discussionremove=true&categoryid=" . $row['id'] . "'><img src='graphics/close.png' /></a>";
         } ?></h2>
 			<p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p>
 			 <?php 
@@ -161,7 +161,7 @@ 
 
         while ($latestpostrow = mysqli_fetch_array($latestpostresult, MYSQLI_ASSOC)) {
             ?>
-			<p><strong>Latest post:</strong> <?php echo $latestpostrow['firstName'].' <strong>on</strong> '.$latestpostrow['topicDate']; ?></p>
+			<p><strong>Latest post:</strong> <?php echo $latestpostrow['firstName'] . ' <strong>on</strong> ' . $latestpostrow['topicDate']; ?></p>
             <?php
         } ?>	
 		</div>
@@ -178,10 +178,10 @@ 
         }
 
         if ($isSubscribed != '') {
-            $subscribe = '<div class="item"><a href="discussion.php?subscribe=false&subscription='.$isSubscribed.'&categoryid='.
-                    $areaid.'">Unsubscribe from this area</a></div>';
+            $subscribe = '<div class="item"><a href="discussion.php?subscribe=false&subscription=' . $isSubscribed . '&categoryid=' .
+                    $areaid . '">Unsubscribe from this area</a></div>';
         } else {
-            $subscribe = '<div class="item"><a href="discussion.php?subscribe=true&categoryid='.$areaid.'">Subscribe to this area</a></div>';
+            $subscribe = '<div class="item"><a href="discussion.php?subscribe=true&categoryid=' . $areaid . '">Subscribe to this area</a></div>';
         }
     } ?>
 	<?php

public/old/fb-callback.php

Indentation +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 session_start();
 
 $fb = new Facebook\Facebook([
-  'app_id'                => $config['auth']['facebook']['appId'],
-  'app_secret'            => $config['auth']['facebook']['appSecret'],
-  'default_graph_version' => 'v2.2',
-  ]);
+    'app_id'                => $config['auth']['facebook']['appId'],
+    'app_secret'            => $config['auth']['facebook']['appSecret'],
+    'default_graph_version' => 'v2.2',
+    ]);
 
 $helper = $fb->getRedirectLoginHelper();
 

Spacing +8 added lines, -8 removed lines

@@ -26,21 +26,21 @@ 
     $accessToken = $helper->getAccessToken();
 } catch (Facebook\Exceptions\FacebookResponseException $e) {
     // When Graph returns an error
-    echo 'Graph returned an error: '.$e->getMessage();
+    echo 'Graph returned an error: ' . $e->getMessage();
     exit;
 } catch (Facebook\Exceptions\FacebookSDKException $e) {
     // When validation fails or other local issues
-    echo 'Facebook SDK returned an error: '.$e->getMessage();
+    echo 'Facebook SDK returned an error: ' . $e->getMessage();
     exit;
 }
 
 if (!isset($accessToken)) {
     if ($helper->getError()) {
         header('HTTP/1.0 401 Unauthorized');
-        echo 'Error: '.$helper->getError()."\n";
-        echo 'Error Code: '.$helper->getErrorCode()."\n";
-        echo 'Error Reason: '.$helper->getErrorReason()."\n";
-        echo 'Error Description: '.$helper->getErrorDescription()."\n";
+        echo 'Error: ' . $helper->getError() . "\n";
+        echo 'Error Code: ' . $helper->getErrorCode() . "\n";
+        echo 'Error Reason: ' . $helper->getErrorReason() . "\n";
+        echo 'Error Description: ' . $helper->getErrorDescription() . "\n";
     } else {
         header('HTTP/1.0 400 Bad Request');
         echo 'Bad request';
@@ -65,7 +65,7 @@ 
     try {
         $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
     } catch (Facebook\Exceptions\FacebookSDKException $e) {
-        echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
+        echo '<p>Error getting long-lived access token: ' . $helper->getMessage() . "</p>\n\n";
         exit;
     }
 }
@@ -78,7 +78,7 @@ 
 } else {
     $redirUrl = 'fb-signup.php';
 }
-header('Location: '.$redirUrl);
+header('Location: ' . $redirUrl);
 
 // User is logged in with a long-lived access token.
 // You can redirect them to a members-only page.

public/old/locations.php

Indentation +5 added lines, -5 removed lines

@@ -54,8 +54,8 @@ 
         }
 
         // After we have inserted the data, we want to head back to the main users page
-     header('Location: locations.php'); // Move to the home page of the admin section
-      exit;
+        header('Location: locations.php'); // Move to the home page of the admin section
+        exit;
     }
 }
 
@@ -121,10 +121,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'; ?>

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;
 }
 
@@ -39,7 +39,7 @@ 
             $sql = "UPDATE cr_locations SET name = '$name' WHERE id = '$editid'";
         }
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
     } else {
         $newlocation = $_POST['newlocation'];
@@ -50,7 +50,7 @@ 
 
         $sql = ("INSERT INTO cr_locations (name) VALUES ('$newlocation')");
         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
@@ -95,8 +95,8 @@ 
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
         $locationID = $row['id'];
-        echo "<span id='".$locationID."' class='edit'>".$row['name'].'</span> ';
-        echo " <a href='locations.php?locationremove=true&locationID=".$locationID."'><i class='fa fa-close'></i></a><br />";
+        echo "<span id='" . $locationID . "' class='edit'>" . $row['name'] . '</span> ';
+        echo " <a href='locations.php?locationremove=true&locationID=" . $locationID . "'><i class='fa fa-close'></i></a><br />";
     } ?>
  </div><!-- /.box-body -->
 </div><!-- /.box -->

public/old/notification.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 } else {
     $notificationId = getQueryStringForKey('id');
     $referer = getQueryStringForKey('click');
-    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/notification.php?id='.$notificationId.'&click='.$referer;
+    $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/notification.php?id=' . $notificationId . '&click=' . $referer;
     header('Location: login.php');
     exit;
 }
@@ -60,7 +60,7 @@ 
     // redir if notification has URL
     $redir = notificationLink($notificationId);
     if (!empty($redir)) {
-        header('Location: '.$redir);
+        header('Location: ' . $redir);
     }
 
     // find notification