TechWilk / rota

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']);
         $click = new NotificationClick();
@@ -31,7 +31,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());
             }
         }
 

src/classes/Controller/AvailabilityController.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 {
     public function getAvailabilityForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user availability GET '/user/".$args['id']."/availability'");
+        $this->logger->info("Fetch user availability GET '/user/" . $args['id'] . "/availability'");
 
         $u = UserQuery::create()->findPk($args['id']);
 
@@ -33,7 +33,7 @@ 
 
     public function postAvailability(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Update user availability POST '/user/".$args['id']."/availability'");
+        $this->logger->info("Update user availability POST '/user/" . $args['id'] . "/availability'");
 
         $u = UserQuery::create()
             ->findPk($args['id']);
@@ -62,8 +62,8 @@ 
                 $a->setAvailable(false);
             }
 
-            if (strlen($data['event'.$eventId.'comment']) > 0) {
-                $a->setComment($data['event'.$eventId.'comment']);
+            if (strlen($data['event' . $eventId . 'comment']) > 0) {
+                $a->setComment($data['event' . $eventId . 'comment']);
             } else {
                 $a->setComment(null);
             }

src/classes/Controller/RoleController.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 {
     public function getAssignRolesForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/roles'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/roles'");
         $r = RoleQuery::create()->find();
         $u = UserQuery::create()->findPK($args['id']);
 
@@ -26,7 +26,7 @@ 
 
     public function postUserAssignRoles(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create user people POST '/user/".$args['id']."/roles'");
+        $this->logger->info("Create user people POST '/user/" . $args['id'] . "/roles'");
 
         $userId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
         $existingRoles = RoleQuery::create()->useUserRoleQuery()->filterByUserId($userId)->endUse()->find();

src/classes/Controller/CalendarController.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
 
     public function getRevokeCalendar(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch settings GET '/user/me/calendar/".$args['id']."/revoke'");
+        $this->logger->info("Fetch settings GET '/user/me/calendar/" . $args['id'] . "/revoke'");
 
         $auth = $this->auth;
         $u = $auth->currentUser();
@@ -101,7 +101,7 @@ 
 
     public function getRenderedCalendar(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch calendar GET '/calendar/".$args['token'].'.'.$args['format']."'");
+        $this->logger->info("Fetch calendar GET '/calendar/" . $args['token'] . '.' . $args['format'] . "'");
 
         $c = CalendarTokenQuery::create()
             ->filterByToken($args['token'])
@@ -118,7 +118,7 @@ 
     {
         $getParameters = $request->getQueryParams();
 
-        $this->logger->info("Fetch -LEGACY- calendar GET '/calendar.php?user=".$getParameters['user'].'&token='.$getParameters['token'].'&format='.$getParameters['format']."'");
+        $this->logger->info("Fetch -LEGACY- calendar GET '/calendar.php?user=" . $getParameters['user'] . '&token=' . $getParameters['token'] . '&format=' . $getParameters['format'] . "'");
 
         $userId = filter_var($getParameters['user'], FILTER_VALIDATE_INT);
         $token = $getParameters['token'];

src/classes/EmailAddress.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         if (filter_var(trim($email), FILTER_VALIDATE_EMAIL)) {
             $this->email = filter_var(trim($email), FILTER_SANITIZE_EMAIL);
         } else {
-            throw new InvalidArgumentException('Invalid email address: '.$email);
+            throw new InvalidArgumentException('Invalid email address: ' . $email);
         }
     }
 

src/middleware.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 // e.g: $app->add(new \Slim\Csrf\Guard);
 
 // 3) add route information to twig
-$app->add(function (Request $request, Response $response, callable $next) {
+$app->add(function(Request $request, Response $response, callable $next) {
     $route = $request->getAttribute('route');
 
     // return NotFound for non existent route

public/old/swap.php

Spacing +7 added lines, -7 removed lines

@@ -110,7 +110,7 @@ 
 if (!empty($eventId)) {
     // ensure user is logged in before allowing creation of swap
     if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
-        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId;
+        $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId;
         header('Location: login.php');
     }
     $createSwap = true;
@@ -186,11 +186,11 @@ 
             <p>
               <strong>
                 <s class="text-red">
-                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
                 </s>
                 &#8594;
                 <span class="text-green">
-                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
+                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
                 </span>
               </strong>
             </p>
@@ -225,16 +225,16 @@ 
                 <select name="newUserRole" class="form-control">
                   <?php
                   if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
+                      $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE';
                   } else {
-                      $whereAnd = 'r.id = '.$role->roleId;
+                      $whereAnd = 'r.id = ' . $role->roleId;
                   }
-                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> '.$role->userId.' AND '.$whereAnd.' ORDER BY lastName, firstName, r.name';
+                  $sql = 'SELECT ur.id, u.firstName, u.lastName, r.name FROM cr_users u INNER JOIN cr_userRoles ur ON ur.userId = u.id INNER JOIN cr_roles r ON r.id = ur.roleId WHERE u.id <> ' . $role->userId . ' AND ' . $whereAnd . ' ORDER BY lastName, firstName, r.name';
                   $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
                   while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                       ?>
-                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
+                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option>
                   <?php
                   } ?>
                 </select>

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 cr_settings set lang_locale = 'de_DE'");                     // de_DE
+        executeDbSql("update cr_settings set lang_locale = 'de_DE'"); // de_DE
             executeDbSql("update cr_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 cr_settings set time_format_normal = '%d.%m.%Y %H:%M '"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%e. %b</strong>, %R'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update cr_settings set time_zone = 'Europe/Berlin'"); //de_DE: Europe/Berlin
             executeDbSql("update cr_settings set google_group_calendar = ''");
         executeDbSql("update cr_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 cr_settings set lang_locale = 'en_GB'");                     // de_DE
+        executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE
             executeDbSql("update cr_settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
             executeDbSql("update cr_settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
-            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'");              // de_DE: %a, <strong>%e. %b</strong>, KW%V
+            executeDbSql("update cr_settings set time_format_short = '%a, <strong>%b %e</strong>, %I:%M %p'"); // de_DE: %a, <strong>%e. %b</strong>, KW%V
             executeDbSql("update cr_settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
             executeDbSql("update cr_settings set google_group_calendar = ''");
         executeDbSql("update cr_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/createEvent.php

Spacing +15 added lines, -15 removed lines

@@ -45,7 +45,7 @@ 
 if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) {
     // Just continue the code
 } else {
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
 }
 
 if ($userisBandAdmin) {
@@ -82,7 +82,7 @@ 
         $location = $row['location'];
         $locationname = $row['locationname'];
         if ($action == 'edit') {
-            $formaction = '?action=edit&id='.$id;
+            $formaction = '?action=edit&id=' . $id;
         } else {
             $formaction = '';
         }
@@ -139,8 +139,8 @@ 
 
     // convert format of date
     $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy
-    $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00'));
-    $date = $date.' '.$time.':00';
+    $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00'));
+    $date = $date . ' ' . $time . ':00';
     $date = mysqli_real_escape_string(db(), $date);
 
     if ($action == 'edit') {
@@ -210,10 +210,10 @@ 
         //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid=2)";
         //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from cr_skills where groupid!=2)";
         if ($userisBandAdmin) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where groupid in (2,3,4))';
         }
         if ($userisEventEditor) {
-            $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
+            $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from cr_skills where not (groupid in (2,3,4)))';
         }
         mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db()));
     }
@@ -221,9 +221,9 @@ 
     // redirect
     if (isset($_SESSION['lastEventsFilter'])) {
         $type = $_SESSION['lastEventsFilter'];
-        header('Location: events.php?view=all&filter='.$type.'#event'.$eventID);
+        header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID);
     } else {
-        header('Location: events.php?view=all#event'.$eventID);
+        header('Location: events.php?view=all#event' . $eventID);
     }
     exit;
 }
@@ -300,7 +300,7 @@ 
                                         while ($ob = mysqli_fetch_object($result)) {
                                             if (!(isset($type) && $ob->id == $type)) {
                                                 $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime));
-                                                echo "<option value='".$ob->id."' title='".$ob->description."' data-time='".($defaultTime == '00:00' ? '' : $defaultTime)."' data-location='".(is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId)."'>".$ob->name.'</option>';
+                                                echo "<option value='" . $ob->id . "' title='" . $ob->description . "' data-time='" . ($defaultTime == '00:00' ? '' : $defaultTime) . "' data-location='" . (is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId) . "'>" . $ob->name . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -326,7 +326,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($subtype) && $row['id'] == $subtype) {
                                             } else {
-                                                echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -354,7 +354,7 @@ 
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                             if (isset($location) && $row['id'] == $location) {
                                             } else {
-                                                echo "<option value='".$row['id']."'>".$row['name'].'</option>';
+                                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
                                             }
                                         } ?>
 									</select>
@@ -497,7 +497,7 @@ 
                                     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
                                         if (isset($type) && $row['id'] == $type) {
                                         } else {
-                                            echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
+                                            echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
                                         }
                                     } ?>
 								</select>
@@ -567,8 +567,8 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?php if (!$userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
-											<?php else: ?>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
+											<?php else : ?>
 											<?php $countReserve += 1 ?>
 											<?php endif //!userRole->getReserve?>
 										<?php endforeach //users?>
@@ -578,7 +578,7 @@ 
 										<?php foreach ($role->getUserRoles() as $userRole): ?>
 											<?php if ($userRole->getReserve()): ?>
 											<?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?>
-											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option>
+											<option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option>
 											<?php endif ?>
 										<?php endforeach //users?>
 										</optgroup>