TechWilk / rota

src/classes/Controller/JobController.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         }
 
         $client = new Client();
-        $url = $site->getUrl()['base'].$this->router->pathFor('home').'old/cr_daily.php';
+        $url = $site->getUrl()['base'] . $this->router->pathFor('home') . 'old/cr_daily.php';
         $guzzleResponse = $client->get($url, [
             'query' => [
                 'token' => $args['token'],

src/classes/Controller/NotificationController.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 {
     public function getNotificationClick(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch settings GET '/notification/".$args['id']."'");
+        $this->logger->info("Fetch settings GET '/notification/" . $args['id'] . "'");
 
         $n = NotificationQuery::create()->findPk($args['id']);
 
@@ -35,7 +35,7 @@ 
 
                 return $response->withStatus(302)->withHeader('Location', $this->router->pathFor($link['route'], $link['attributes']));
             } else {
-                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').$n->getLink());
+                return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . $n->getLink());
             }
         }
 

public/old/statistics.php

Indentation +6 added lines, -6 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -26,28 +26,28 @@ 
     if ($method == 'truncate') {
         $sql = "CREATE TABLE tmp_system_statistics as SELECT * from statistics WHERE type='system'";
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('TRUNCATE TABLE statistics');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = ('ALTER TABLE statistics  AUTO_INCREMENT = 50');
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('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)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         $sql = 'DROP TABLE tmp_system_statistics';
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         insertStatistics('system', __FILE__, 'statistics deleted');
@@ -103,22 +103,22 @@ 
               <?php
 
                         $sql = 'SELECT VERSION( ) AS mysqli_version';
-            $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db()));
+            $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db()));
             $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
             $mysqli_version = $dbv['mysqli_version'];
 
             if (substr($mysqli_version, 0, 1) == 5) {
-                $sql = "SELECT getBrowserInfo(detail3) as browser,count(*) as count from 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 die(mysqli_error(db()));
             while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                 extract($row);
                 echo '<tr>';
-                echo '<td>'.$browser.'</td>';
-                echo '<td>'.$count.'</td>';
+                echo '<td>' . $browser . '</td>';
+                echo '<td>' . $count . '</td>';
                 echo '</tr>';
             } ?>
 
@@ -145,16 +145,16 @@ 
                   $sql .= " AND s.type = 'system'";
               }
           }
-                $sql .= ' ORDER BY date desc '.$limit;
+                $sql .= ' ORDER BY date desc ' . $limit;
                 $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
                 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                     extract($row);
                     echo '<tr>';
-                    echo '<td>'.$date.'</td>';
-                    echo '<td>'.$name.'</td>';
-                    echo '<td>'.$type.'</td>';
-                    echo '<td>'.$detail1.'</td>';
-                    echo '<td>'.$detail2.'</td>';
+                    echo '<td>' . $date . '</td>';
+                    echo '<td>' . $name . '</td>';
+                    echo '<td>' . $type . '</td>';
+                    echo '<td>' . $detail1 . '</td>';
+                    echo '<td>' . $detail2 . '</td>';
                     //echo "<td>".$detail3."</td>";
                     echo '</tr>';
                 }

public/old/tableView.php

Spacing +15 added lines, -15 removed lines

@@ -111,7 +111,7 @@ 
 									 FROM eventTypes et
 									 WHERE id IN (SELECT e.type
 										 						FROM events e
-																WHERE '.$whereTwoMonth.'
+																WHERE '.$whereTwoMonth . '
 																AND e.removed = 0)
 									 ORDER BY name';
         $result = mysqli_query(db(), $filter_sql) or die(mysqli_error(db()));
@@ -132,7 +132,7 @@ 
 <tr>
 	<td ><strong>Event</strong></td>
 	<?php
-    $sql = 'SELECT * FROM groups g ORDER BY '.$group_sorting_name;
+    $sql = 'SELECT * FROM groups g ORDER BY ' . $group_sorting_name;
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
@@ -162,7 +162,7 @@ 
 
     if ($filter == '') {
         $sql .= '
-							AND '.$whereTwoMonth.'
+							AND '.$whereTwoMonth . '
 						ORDER BY
 							e.date';
     } elseif ($filter == 'all') {
@@ -172,7 +172,7 @@ 
     } elseif ($filter != '') {
         $sql .= "
 							AND e.type = '$filter'
-							AND ".$whereTwoMonth.'
+							AND " . $whereTwoMonth . '
 						ORDER BY
 							e.date';
     }
@@ -186,31 +186,31 @@ 
         echo '<tr>';
         echo '<td >';
         setlocale(LC_TIME, $lang_locale); //de_DE
-        echo '<a href="event.php?id='.$row['id'].'">';
+        echo '<a href="event.php?id=' . $row['id'] . '">';
         echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V
         echo '</a>';
 
         //$row['sundayDate']
         if (!empty($row['eventType'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventType'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventType'] . '</em>';
         }
         if (!empty($row['eventSubType'])) {
-            echo ' - <em>'.$row['eventSubType'].'</em>';
+            echo ' - <em>' . $row['eventSubType'] . '</em>';
         }
         if (!empty($row['eventLocation'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventLocation'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventLocation'] . '</em>';
         }
         if (!empty($row['name'])) {
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['name'].'</em>';
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['name'] . '</em>';
         }
         if (!empty($row['eventGroup'])) {
-            echo '<br /><strong>&nbsp;&nbsp;&nbsp;'.$row['eventGroup'].'</strong>';
+            echo '<br /><strong>&nbsp;&nbsp;&nbsp;' . $row['eventGroup'] . '</strong>';
         }
         if (!empty($row['sermonTitle'])) {
-            echo ': '.$row['sermonTitle'];
+            echo ': ' . $row['sermonTitle'];
         }
         if (!empty($row['bibleVerse'])) {
-            echo ' <em>('.$row['bibleVerse'].')</em>';
+            echo ' <em>(' . $row['bibleVerse'] . ')</em>';
         }
         echo '</td>';
 
@@ -242,16 +242,16 @@ 
                     if ($previousName == '') {
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } elseif ($previousName != $name) {
                         echo ')</em>';
                         echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : '';
                         echo '<br />'; // line break from previous name
                         // new name
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
-                        echo $name.' <em>('.$viewPeople['role'];
+                        echo $name . ' <em>(' . $viewPeople['role'];
                     } else {
-                        echo ', '.$viewPeople['role'];
+                        echo ', ' . $viewPeople['role'];
                     }
 
                     $peopleInEvent = true;

public/old/roles.php

Spacing +7 added lines, -7 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 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 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()));
         }
     } else {
         // Handle renaming of the roles
@@ -103,11 +103,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++;
     }
@@ -173,7 +173,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/update.settings.php

Spacing +8 added lines, -8 removed lines

@@ -33,7 +33,7 @@ 
     exit;
 }
 if (!isAdmin()) {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
     exit;
 }
 
@@ -57,20 +57,20 @@ 
 if ($action == 'update') {
     //if ($language='de-de')
     if ($rowSettings['lang_locale'] == 'en_GB') {
-        executeDbSql("update settings set lang_locale = 'de_DE'");                     // de_DE
+        executeDbSql("update settings set lang_locale = 'de_DE'"); // de_DE
             executeDbSql("update settings set time_format_long = '%A, %e. %B %Y, %R Uhr, KW%V'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update settings set time_format_normal = '%d.%m.%Y %H:%M '"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update settings set time_zone = 'Europe/Berlin'"); //de_DE: Europe/Berlin
             executeDbSql("update settings set google_group_calendar = ''");
         executeDbSql("update settings set overviewemail = '{{Gottesdienst-Planung [MONTH] [YEAR]}}\r\nHallo zusammen,\r\n\r\nanbei die Gottesdienst-Planung fuer [MONTH] [YEAR]\r\n\r\n[OVERVIEW]\r\n\r\nBitte fruehzeitig Bescheid geben, wenn etwas NICHT passt, ansonsten gehe ich davon aus, dass ihr wie geplant koennt.\r\n\r\nAlles Gute und Gottes Segen f�r Euch und Euren Dienst.\r\nEuer Gottesdienst Orga-Team'");
     }
     //else
     if ($rowSettings['lang_locale'] == 'de_DE') {
-        executeDbSql("update settings set lang_locale = 'en_GB'");                     // de_DE
+        executeDbSql("update settings set lang_locale = 'en_GB'"); // de_DE
             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 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'");
@@ -82,7 +82,7 @@ 
     $resultSettings = mysqli_query(db(), $sqlSettings) or die(mysqli_error(db()));
     $rowSettings = mysqli_fetch_array($resultSettings, MYSQLI_ASSOC);
 
-    $updateNotification = 'Settings updated successfully to: '.$rowSettings['lang_locale'].' <br>&nbsp;<br>';
+    $updateNotification = 'Settings updated successfully to: ' . $rowSettings['lang_locale'] . ' <br>&nbsp;<br>';
 }
 
 $formatting = 'true';
@@ -94,8 +94,8 @@ 
 	<hr>
 	This page has only beta status. <br>Please do only use it in testing environments!
 	<hr>
-	<?php echo 'Your web browser identifies your language as: '.$language; ?><br>
-	<?php echo 'Church Rota is set to use: '.$rowSettings['lang_locale']; ?><br>&nbsp;<br>
+	<?php echo 'Your web browser identifies your language as: ' . $language; ?><br>
+	<?php echo 'Church Rota is set to use: ' . $rowSettings['lang_locale']; ?><br>&nbsp;<br>
 	
 <?php
 if ($updateNotification == '') {

public/old/emails.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,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;
 }
 
@@ -71,7 +71,7 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
         if (!mysqli_query(db(), $sql)) {
-            die('Error: '.mysqli_error(db()));
+            die('Error: ' . mysqli_error(db()));
         }
 
         // After we have inserted the data, we want to head back to the main page
@@ -88,7 +88,7 @@ 
 
             $sql = ("INSERT INTO eventPeople (eventID, skillID) VALUES ('$editeventID', '$editskillID')");
             if (!mysqli_query(db(), $sql)) {
-                die('Error: '.mysqli_error(db()));
+                die('Error: ' . mysqli_error(db()));
             }
         }
 

public/old/includes/header.php

Spacing +3 added lines, -3 removed lines

@@ -294,7 +294,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>
@@ -304,7 +304,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 -->
@@ -359,7 +359,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 die(mysqli_error(db()));
                                             $currentUser = mysqli_fetch_object($result);
                             ?>

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 die(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;
     }
 }