TechWilk / rota

public/old/includes/functions.auth.php

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
         $_SESSION['db_is_logged_in'] = true;
         $_SESSION['isAdmin'] = $row['isAdmin']; // Set the admin status to be carried across this session
         $_SESSION['userid'] = $row['id'];
-        $_SESSION['name'] = $row['firstName'].' '.$row['lastName'];
+        $_SESSION['name'] = $row['firstName'] . ' ' . $row['lastName'];
         $_SESSION['isBandAdmin'] = $row['isBandAdmin']; // Set the band admin status to be carried across this session
         $_SESSION['isEventEditor'] = $row['isEventEditor']; // Set the event editor status to be carried across this session
         $_SESSION['onlyShowUserEvents'] = $users_start_with_myevents; // 1 if users_start_with_myevents is set in settings, can be changed by user during session
@@ -29,13 +29,13 @@ 
 
         // admin section
         if ($_SESSION['isAdmin'] == 1) {
-            updateDatabase();                        //check for db updates
+            updateDatabase(); //check for db updates
             //$_SESSION['onlyShowUserEvents'] = '0';		//show all events for admin, regardless what settings say
         }
 
         // Update last login timestamp
         $currentTimestamp = date('Y-m-d H:i:s');
-        $sql = "UPDATE users SET lastLogin = '$currentTimestamp' WHERE id = '".$row['id']."'";
+        $sql = "UPDATE users SET lastLogin = '$currentTimestamp' WHERE id = '" . $row['id'] . "'";
         mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
         // redirect
@@ -44,11 +44,11 @@ 
             $redirectFromSession = strip_tags($_SESSION['redirectUrl']);
             unset($_SESSION['redirectUrl']);
             // check is url is on same domain and prevents redirecting to logout page
-            if (strncmp(strtolower(siteSettings()->getSiteUrl().'/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) {
+            if (strncmp(strtolower(siteSettings()->getSiteUrl() . '/'), strtolower($redirectFromSession), (strlen(siteSettings()->getSiteUrl()) + 1)) == 0 && strpos($redirectFromSession, 'logout.php') === false) {
                 $redirectUrl = $redirectFromSession;
             }
         }
-        header('Location: '.$redirectUrl);
+        header('Location: ' . $redirectUrl);
         exit;
     }
 }

public/old/includes/functions.mail.php

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 . ' ';
         }
     } else {
         $skillfinal = $rotaoutput;
@@ -284,7 +284,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`,
@@ -325,13 +325,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.
         }
@@ -347,7 +347,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);
 
@@ -418,9 +418,9 @@ 
 
                 $type = $ob->eventType;
 
-                $eventdetails = $eventrow['eventGroup'].': '.$eventrow['sermonTitle'];
+                $eventdetails = $eventrow['eventGroup'] . ': ' . $eventrow['sermonTitle'];
                 if (!empty($eventrow['bibleVerse'])) {
-                    $eventdetails .= ' ('.$eventrow['bibleVerse'].')';
+                    $eventdetails .= ' (' . $eventrow['bibleVerse'] . ')';
                 }
             }
 
@@ -444,7 +444,7 @@ 
                 if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])) {
                     $roles[] = $roleRow['description'];
                 } else {
-                    $roles[] = $roleRow['description'].' - '.$roleRow['name'];
+                    $roles[] = $roleRow['description'] . ' - ' . $roleRow['name'];
                 }
             }
 
@@ -464,11 +464,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");
 
@@ -503,7 +503,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 exit(mysqli_error(db()));
     }
@@ -532,14 +532,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.
@@ -572,7 +572,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";
 
@@ -596,7 +596,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,
@@ -610,8 +610,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);
@@ -619,10 +619,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)
@@ -669,16 +669,16 @@ 
     $result = mysqli_query(db(), $sql) or exit(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;
 }
@@ -730,16 +730,16 @@ 
     $result = mysqli_query(db(), $sql) or exit(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;
 }
@@ -755,14 +755,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.
@@ -825,8 +825,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);
@@ -834,10 +834,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
@@ -850,14 +850,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.
@@ -890,7 +890,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);
@@ -943,7 +943,7 @@ 
 
         $eventDetails .= $row['joinedskills'];
         $eventDetails .= "\r\n";
-        $eventDetails .= 'Notes: '.$row['comment'];
+        $eventDetails .= 'Notes: ' . $row['comment'];
         $eventDetails .= "\r\n";
         $eventDetails .= "\r\n";
     }
@@ -959,8 +959,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);
@@ -968,10 +968,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)
@@ -986,10 +986,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";
@@ -999,8 +999,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!';
     }
 }
@@ -1015,11 +1015,11 @@ 
     $userresult = mysqli_query(db(), $sql) or exit(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";
@@ -1036,7 +1036,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/config.php

Spacing +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@ 
 
 namespace TechWilk\Rota;
 
-include __DIR__.'/../../../config/database.php';
-include __DIR__.'/../../../config/auth.php';
-include __DIR__.'/../../../config/email.php';
-include __DIR__.'/../../../config/recording.php';
+include __DIR__ . '/../../../config/database.php';
+include __DIR__ . '/../../../config/auth.php';
+include __DIR__ . '/../../../config/email.php';
+include __DIR__ . '/../../../config/recording.php';
 
 // -- Setup database --
 
@@ -17,10 +17,10 @@ 
 }
 
 // Connect to the database server
-$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or exit('Connection to '.$config['db']['host']." with login '".$config['db']['user']."'/'$pwdMasked' failed.");
+$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or exit('Connection to ' . $config['db']['host'] . " with login '" . $config['db']['user'] . "'/'$pwdMasked' failed.");
 
 // Choose the right database
-$db = @mysqli_select_db($dbh, $config['db']['dbname']) or exit("Connection made, but database '".$config['db']['dbname']."' was not found.");
+$db = @mysqli_select_db($dbh, $config['db']['dbname']) or exit("Connection made, but database '" . $config['db']['dbname'] . "' was not found.");
 
 // allow config to be fetched in functions
 

public/old/includes/functions.database.php

Spacing +28 added lines, -28 removed lines

@@ -24,14 +24,14 @@ 
 function executeDbSql($sql)
 {
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()).', SQL: '.$sql);
+        exit('Error: ' . mysqli_error(db()) . ', SQL: ' . $sql);
     }
 }
 
 function updateDatabase()
 {
     $sql = 'SELECT VERSION( ) AS mysqli_version';
-    $result = mysqli_query(db(), $sql) or exit('MySQL-Error: '.mysqli_error(db()));
+    $result = mysqli_query(db(), $sql) or exit('MySQL-Error: ' . mysqli_error(db()));
     $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
     $mysqli_version = $dbv['mysqli_version'];
     //echo $mysqli_version."<br>";
@@ -85,41 +85,41 @@ 
             executeDbSql("alter table users add(isOverviewRecipient char(2) NOT NULL DEFAULT '0')");
             executeDbSql('alter table groups add(short_name char(2))');
 
-            executeDbSql("update settings set lang_locale = 'en_GB'");                     // de_DE
+            executeDbSql("update settings set lang_locale = 'en_GB'"); // de_DE
             executeDbSql('update settings set event_sorting_latest = 0');
             executeDbSql('update settings set snapshot_show_two_month = 0');
             executeDbSql('update settings set snapshot_reduce_skills_by_group = 0');
             executeDbSql('update settings set logged_in_show_snapshot_button = 0');
             executeDbSql("update settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update settings set version = '2.1.0'");
             executeDbSql('update settings set users_start_with_myevents = 0');
             executeDbSql("update settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
             executeDbSql("update settings set google_group_calendar = ''");
             executeDbSql("update settings set overviewemail = 'Hello,\r\n\r\nIn this email you find the Rota for [MONTH] [YEAR].\r\n\r\n[OVERVIEW]\r\n\r\nPlease inform us as soon as possible, if you are not able to serve as scheduled.\r\n\r\nBe blessed.\r\nChurch Support Stuff'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.0', $_SESSION['userid']);
         case '2.1.0':
             executeDbSql('create table settings_bkp2_1_0 as select * from settings');
             executeDbSql('alter table settings add(group_sorting_name int(1))');
             executeDbSql("update settings set version = '2.1.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.1', $_SESSION['userid']);
         case '2.1.1':
             executeDbSql("update settings set version = '2.1.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.2', $_SESSION['userid']);
         case '2.1.2':
             executeDbSql("alter table settings add(debug_mode int(1) DEFAULT '0')");
-            executeDbSql('update settings set group_sorting_name = 0');  //was a workaround, fixed in V2.2.1
+            executeDbSql('update settings set group_sorting_name = 0'); //was a workaround, fixed in V2.2.1
 
             executeDbSql("update settings set version = '2.2.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.0', $_SESSION['userid']);
         case '2.2.0':
             executeDbSql("alter table users add(isBandAdmin char(2) NOT NULL DEFAULT '0')");
             executeDbSql('update settings set group_sorting_name = 0'); //due to an error reset it again
 
             executeDbSql("update settings set version = '2.2.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.1', $_SESSION['userid']);
         case '2.2.1':
                 $sql = "CREATE TABLE IF NOT EXISTS `statistics` (
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -135,21 +135,21 @@ 
             executeDbSql($sql);
 
             executeDbSql("update settings set version = '2.3.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.0', $version);
         case '2.3.0':
             executeDbSql("alter table users add(isEventEditor char(2) NOT NULL DEFAULT '0')");
 
             executeDbSql("update settings set version = '2.3.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.1', $version);
         case '2.3.1':
             executeDbSql("update settings set version = '2.3.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.2', $version);
         case '2.3.2':
             executeDbSql("update settings set version = '2.3.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.3', $version);
         case '2.3.3':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -198,33 +198,33 @@ 
                 );
             }
             executeDbSql("update settings set version = '2.3.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.4', $version);
         case '2.3.4':
             executeDbSql("update settings set version = '2.3.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.3.5', $version);
         case '2.3.5':
             executeDbSql("update settings set version = '2.4.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.0', $version);
         case '2.4.0':
             executeDbSql("update settings set version = '2.4.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.1', $version);
         case '2.4.1':
             executeDbSql('alter table settings add(days_to_alert int(2) DEFAULT 5) ');
             executeDbSql("alter table settings add(token varchar(100) DEFAULT '') ");
             executeDbSql("update settings set version = '2.4.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.2', $version);
         case '2.4.2':
             executeDbSql("update settings set version = '2.4.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.3', $version);
         case '2.4.3':
             executeDbSql("update settings set version = '2.4.4'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.4', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.4', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.4', $version);
         case '2.4.4':
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -274,27 +274,27 @@ 
                 );
             }
             executeDbSql("update settings set version = '2.4.5'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.5', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.5', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.4.5', $version);
         case '2.4.5':
             executeDbSql("update settings set version = '2.5.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.0', $version);
         case '2.5.0':
             executeDbSql("update settings set version = '2.5.1'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.1', $version);
         case '2.5.1':
             executeDbSql("update settings set version = '2.5.2'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.2', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.2', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.2', $version);
         case '2.5.2':
             executeDbSql("update settings set version = '2.5.3'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.3', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.3', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.5.3', $version);
         case '2.5.3':
             executeDbSql("update settings set version = '2.6.0'");
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.6.0', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.6.0', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '2.6.0', $version);
         case '2.6.0':
             $sql = "ALTER TABLE users
@@ -370,7 +370,7 @@ 
             executeDbSql($sql);
             executeDbSql("update settings set version = '3.0.0-pre1'");
 
-            notifyInfo(__FILE__, 'db-update='.$version.'->3.0.0-pre1', $_SESSION['userid']);
+            notifyInfo(__FILE__, 'db-update=' . $version . '->3.0.0-pre1', $_SESSION['userid']);
             insertStatistics('system', __FILE__, 'db-update', '3.0.0-pre1', $version);
         case '3.0.0-pre1':
             $sql = "CREATE TABLE IF NOT EXISTS notifications (

public/old/includes/header.php

Spacing +3 added lines, -3 removed lines

@@ -295,7 +295,7 @@ 
 							<!-- Menu toggle button -->
 							<a href="#" class="dropdown-toggle" data-toggle="dropdown">
 								<i class="fa fa-bell-o"></i>
-								<?php echo $unseen >= 1 ? '<span class="label label-warning">'.$unseen.'</span>' : '' ?>
+								<?php echo $unseen >= 1 ? '<span class="label label-warning">' . $unseen . '</span>' : '' ?>
 							</a>
 							<ul class="dropdown-menu">
 								<li class="header">You have <?php echo $unseen >= 1 ? $unseen : 'no' ?> new notifications</li>
@@ -305,7 +305,7 @@ 
 									<?php foreach ($notifications as $n) { ?>
 										<li><!-- start notification -->
 											<a href="notification.php?click=notifications-panel&id=<?php echo $n->id ?>">
-												<i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>'.$n->summary.'</strong>' ?>
+												<i class="fa fa-users text-aqua"></i> <?php echo $n->seen ? $n->summary : '<strong>' . $n->summary . '</strong>' ?>
 												<small><?php echo timeAgoInWords($n->timestamp) ?></small>
 											</a>
 										</li><!-- end notification -->
@@ -360,7 +360,7 @@ 
 						<!-- User Account Menu -->
 						<li class="dropdown user user-menu">
 							<?php
-                            $sql = 'SELECT u.created FROM users u WHERE id = '.$_SESSION['userid'];
+                            $sql = 'SELECT u.created FROM users u WHERE id = ' . $_SESSION['userid'];
                                             $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
                                             $currentUser = mysqli_fetch_object($result);
                             ?>

public/old/includes/functions.users.php

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
     }
 
     // create username and remove all whitespace
-    $username = $firstNameLower.'.'.$lastNameLower;
+    $username = $firstNameLower . '.' . $lastNameLower;
     $username = preg_replace('/\s+/', '', $username);
 
     $sql = ("INSERT INTO users (firstName, lastName, username, email, mobile, password, created, updated)
@@ -46,12 +46,12 @@ 
     $id = mysqli_insert_id(db());
 
     $notificationMessage = "Welcome to your new account on the rota system.\n
-If you have any issues, please get in touch with us [".siteSettings()->getAdminEmailAddress().'](mailto:'.siteSettings()->getAdminEmailAddress().").\n
+If you have any issues, please get in touch with us [".siteSettings()->getAdminEmailAddress() . '](mailto:' . siteSettings()->getAdminEmailAddress() . ").\n
 ---\n
 **Sync to digital calendar**\n
 You may wish to link the rota to your digital calendar on your computer and phone.  To do so, generate a [calendar token](calendarTokens.php) which will present you with your unique URL.  Follow instructions from your digital calendar provider for exact details on how import an iCal feed, or get in touch and we may be able to help.\n";
 
-    createNotificationForUser($id, 'Welcome '.$firstName, $notificationMessage, 'feature');
+    createNotificationForUser($id, 'Welcome ' . $firstName, $notificationMessage, 'feature');
     createNotificationForUser($id, 'Change your password', 'Please change your password to something unique and memorable.', 'account', 'editPassword.php');
 
     return $id;
@@ -145,7 +145,7 @@ 
     $sql = "SELECT firstName, lastName FROM users WHERE id = '$id'";
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
     $ob = mysqli_fetch_object($result);
-    $name = $ob->firstName.' '.$ob->lastName;
+    $name = $ob->firstName . ' ' . $ob->lastName;
 
     return $name;
 }
@@ -219,7 +219,7 @@ 
     $currentTimestamp = date('Y-m-d H:i:s');
     $sql = "UPDATE users SET password = '$newPassword', passwordChanged = '$currentTimestamp' WHERE id = '$userId'";
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
-    insertStatistics('user', __FILE__, 'password force changed for user '.getNameWithId($userId), null, $_SERVER['HTTP_USER_AGENT']);
+    insertStatistics('user', __FILE__, 'password force changed for user ' . getNameWithId($userId), null, $_SERVER['HTTP_USER_AGENT']);
 }
 
 function hashPassword($plainTextPassword)
@@ -265,7 +265,7 @@ 
     if ($loginFailures < $numberOfAllowedAttempts) {
         return true;
     } else {
-        insertStatistics('user', __FILE__, 'Login attempts exceeded for username: '.$username, $ipAddress, $_SERVER['HTTP_USER_AGENT']);
+        insertStatistics('user', __FILE__, 'Login attempts exceeded for username: ' . $username, $ipAddress, $_SERVER['HTTP_USER_AGENT']);
 
         return false;
     }
@@ -341,11 +341,11 @@ 
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
 
     $pendingId = mysqli_insert_id(db());
-    $linkToApprove = 'pendingAccounts.php?id='.$pendingId;
+    $linkToApprove = 'pendingAccounts.php?id=' . $pendingId;
 
-    $email = siteSettings()->getOwner().'<'.siteSettings()->getAdminEmailAddress().'>';
-    $subject = $firstName.' requested an account';
-    $message = $subject.' through '.$source.".\nApprove or decline: ".siteSettings()->getSiteUrl().'/'.$linkToApprove;
+    $email = siteSettings()->getOwner() . '<' . siteSettings()->getAdminEmailAddress() . '>';
+    $subject = $firstName . ' requested an account';
+    $message = $subject . ' through ' . $source . ".\nApprove or decline: " . siteSettings()->getSiteUrl() . '/' . $linkToApprove;
 
     sendMail($email, $subject, $message, $email);
 
@@ -417,7 +417,7 @@ 
     addSocialAuthToUserWithId($userId, $pendingUser->socialId, $pendingUser->source);
     updateUser($userId, $pendingUser->firstName, $pendingUser->lastName, $pendingUser->email, null);
 
-    createNotificationForUser($userId, 'Social Login added: '.$pendingUser->source, 'Your social media login details for '.$pendingUser->source.' have been added to your existing account', 'account');
+    createNotificationForUser($userId, 'Social Login added: ' . $pendingUser->source, 'Your social media login details for ' . $pendingUser->source . ' have been added to your existing account', 'account');
     createFacebookNotificationForUser($userId, 'login.php', 'Your account request has been approved. You can now login via Facebook.');
 
     return true;
@@ -500,32 +500,32 @@ 
 
 function getProfileImageUrl($userId, $size = 'small')
 {
-    $sql = 'SELECT sa.socialId, u.email FROM users u LEFT JOIN socialAuth sa ON sa.userId = u.id WHERE id = '.$userId;
+    $sql = 'SELECT sa.socialId, u.email FROM users u LEFT JOIN socialAuth sa ON sa.userId = u.id WHERE id = ' . $userId;
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
     $user = mysqli_fetch_object($result);
 
     if ($user->socialId) {
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//graph.facebook.com/'.$user->socialId.'/picture?type=square';
+                return '//graph.facebook.com/' . $user->socialId . '/picture?type=square';
                 break;
             case 'large': // 200px x 200px
-                return '//graph.facebook.com/'.$user->socialId.'/picture?type=large';
+                return '//graph.facebook.com/' . $user->socialId . '/picture?type=large';
                 break;
             default:
-                return '//graph.facebook.com/'.$user->socialId.'/picture';
+                return '//graph.facebook.com/' . $user->socialId . '/picture';
                 break;
         }
     } else {
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=50&d=mm';
                 break;
             case 'large': // 200px x 200px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=200&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=200&d=mm';
                 break;
             default:
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($user->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($user->email))) . '?s=50&d=mm';
                 break;
         }
     }

public/old/includes/functions.roles.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
     $sql = "UPDATE roles SET name = '$name', description = '$description' WHERE id = '$id'";
 
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -39,13 +39,13 @@ 
     $sql = "UPDATE groups SET name = '$name' WHERE groupId = '$key'";
 
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('Error: ' . mysqli_error(db()));
     }
 
     $sql = "UPDATE groups SET description = '$description' WHERE groupId = '$key'";
 
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -54,7 +54,7 @@ 
     $sql = "UPDATE roles SET groupId = '$value' WHERE id = '$roleID'";
 
     if (!mysqli_query(db(), $sql)) {
-        exit('Error: '.mysqli_error(db()));
+        exit('Error: ' . mysqli_error(db()));
     }
 }
 
@@ -131,7 +131,7 @@ 
         return $ob->allowRoleSwaps;
     }
 
-    $sql = "SELECT allowRoleSwaps FROM groups WHERE id = '".$ob->groupId."'";
+    $sql = "SELECT allowRoleSwaps FROM groups WHERE id = '" . $ob->groupId . "'";
     $result = mysqli_query(db(), $sql) or exit(mysqli_error(db()));
     $ob = mysqli_fetch_object($result);
 

public/old/statistics.php

Spacing +18 added lines, -18 removed lines

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

public/api/v1/index.php

Spacing +4 added lines, -4 removed lines

@@ -23,9 +23,9 @@ 
     // Start of API
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    require_once __DIR__.'/../../../vendor/autoload.php';
+    require_once __DIR__ . '/../../../vendor/autoload.php';
 
-    require_once __DIR__.'/../../../generated-conf/config.php';
+    require_once __DIR__ . '/../../../generated-conf/config.php';
 
     // Create and configure Slim app
     $app = new \Slim\App(['settings' => $config]);
@@ -36,7 +36,7 @@ 
 
     $container = $app->getContainer();
 
-    $container['db'] = function ($c) {
+    $container['db'] = function($c) {
         $db_config = $c['settings']['db'];
         $db = new Database($db_config);
 
@@ -49,7 +49,7 @@ 
 
     // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
 
-    $app->post('/series', function ($request, $response, $args) {
+    $app->post('/series', function($request, $response, $args) {
         $postData = $request->getParsedBody();
 
         $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);