TechWilk / rota

api-classes/Event.php

Indentation +21 added lines, -21 removed lines

@@ -131,13 +131,13 @@ 
         $currentTimestamp = $date = strftime('%F %T', time());
 
         $data = [
-      ['field' => 'name', 'type' => 'string', 'value' => $this->name],
-      ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
-      ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
-      ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
-      ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
-      ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
-      ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
+        ['field' => 'name', 'type' => 'string', 'value' => $this->name],
+        ['field' => 'date', 'type' => 'string', 'value' => $this->datetime],
+        ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()],
+        ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()],
+        ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()],
+        ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()],
+        ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp],
     ];
 
         if (isset($this->notes)) {
@@ -164,23 +164,23 @@ 
         }
 
         $columns = [
-      'id',
-      'name',
-      'date',
-      'eventGroup',
-      'type',
-      'subType',
-      'location',
-      'comment',
-      'sermonTitle',
-      'bibleVerse',
-      'deleted',
-      'created',
-      'updated',
+        'id',
+        'name',
+        'date',
+        'eventGroup',
+        'type',
+        'subType',
+        'location',
+        'comment',
+        'sermonTitle',
+        'bibleVerse',
+        'deleted',
+        'created',
+        'updated',
     ];
 
         $where = [
-      'id = '.$id,
+        'id = '.$id,
     ];
 
         $result = $db->selectSingle('Event', $this->db_table, $columns, $where);

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
     {
         foreach ($rehersals as $rehersal) {
             if (!is_a($rehersal, 'Rehersal')) {
-                throw new Exception('Rehersal is not a Rehersal object: '.$rehersal, 1);
+                throw new Exception('Rehersal is not a Rehersal object: ' . $rehersal, 1);
             }
         }
         $this->rehersals = $rehersals;
@@ -117,12 +117,12 @@ 
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->datetime) || empty($this->series) || empty($this->type) || empty($this->subType) || empty($this->location)) {
-            $message = 'Series name ('.$this->name.')';
-            $message .= ' or date ('.$this->datetime.')';
-            $message .= ' or series ('.$this->series.')';
-            $message .= ' or type ('.$this->type.')';
-            $message .= ' or sub_type ('.$this->subType.')';
-            $message .= ' or location ('.$this->location.')';
+            $message = 'Series name (' . $this->name . ')';
+            $message .= ' or date (' . $this->datetime . ')';
+            $message .= ' or series (' . $this->series . ')';
+            $message .= ' or type (' . $this->type . ')';
+            $message .= ' or sub_type (' . $this->subType . ')';
+            $message .= ' or location (' . $this->location . ')';
             $message .= ' cannot be empty.';
 
             throw new Exception($message);
@@ -180,7 +180,7 @@ 
     ];
 
         $where = [
-      'id = '.$id,
+      'id = ' . $id,
     ];
 
         $result = $db->selectSingle('Event', $this->db_table, $columns, $where);

generated-classes/TechWilk/Rota/User.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         if (!password_verify($v, $this->password)) {
             $bcrypt_options = [
         'cost' => 12,
-      ];
+        ];
             $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options);
 
             $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true;

Spacing +14 added lines, -14 removed lines

@@ -78,7 +78,7 @@ 
      */
     public function getName()
     {
-        return $this->firstname.' '.$this->lastname;
+        return $this->firstname . ' ' . $this->lastname;
     }
 
     /**
@@ -97,37 +97,37 @@ 
                 if ($socialAuth->getPlatform() == 'facebook') {
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square';
                             break;
                         case 'medium': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         case 'large': // 200px x 200px
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large';
                             break;
                         default:
-                            return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture';
+                            return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture';
                             break;
                     }
                 } elseif ($socialAuth->getPlatform() == 'onebody') {
                     $baseUrl = getConfig()['auth']['onebody']['url'];
                     $photoFingerprint = $socialAuth->getMeta()['photo-fingerprint'];
                     $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION);
-                    if(empty($photoFingerprint)) {
+                    if (empty($photoFingerprint)) {
                         continue;
                     }
                     switch ($size) {
                         case 'small': // 50px x 50px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'medium': // 150px x 150px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension;
                             break;
                         case 'large': // 500px x 500px
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension;
                             break;
                         default:
-                            return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension;
+                            return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension;
                         break;
                     }
                 }
@@ -136,16 +136,16 @@ 
 
         switch ($size) {
             case 'small': // 50px x 50px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
                 break;
             case 'medium': // 200px x 200px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm';
                 break;
             case 'large': // 500px x 500px
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm';
                 break;
             default:
-                return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm';
+                return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm';
             break;
         }
     }

api-classes/Person.php

Spacing +6 added lines, -6 removed lines

@@ -24,12 +24,12 @@
     public function createInDb(Database $db)
     {
         if (empty($this->name) || empty($this->datetime) || empty($this->series) || empty($this->type) || empty($this->sub_type) || empty($this->location)) {
-            $message = 'Series name ('.$this->name.')';
-            $message .= ' or date ('.$this->datetime.')';
-            $message .= ' or series ('.$this->series.')';
-            $message .= ' or type ('.$this->type.')';
-            $message .= ' or sub_type ('.$this->sub_type.')';
-            $message .= ' or location ('.$this->location.')';
+            $message = 'Series name (' . $this->name . ')';
+            $message .= ' or date (' . $this->datetime . ')';
+            $message .= ' or series (' . $this->series . ')';
+            $message .= ' or type (' . $this->type . ')';
+            $message .= ' or sub_type (' . $this->sub_type . ')';
+            $message .= ' or location (' . $this->location . ')';
             $message .= ' cannot be empty.';
 
             throw new Exception($message);

public/old/events.php

Spacing +22 added lines, -22 removed lines

@@ -48,9 +48,9 @@ 
 } else {
     $urlFilters = '';
     if (isset($_SESSION['lastEventsFilter'])) {
-        $urlFilters = '&filter='.$_SESSION['lastEventsFilter'];
+        $urlFilters = '&filter=' . $_SESSION['lastEventsFilter'];
     }
-    header('Location: events.php?view=all'.$urlFilters);
+    header('Location: events.php?view=all' . $urlFilters);
     exit;
 }
 
@@ -70,7 +70,7 @@ 
         session_destroy();
         header('Location: login.php');
     } else {
-        header('Location: events.php?view='.$sessionUserID);
+        header('Location: events.php?view=' . $sessionUserID);
         exit;
     }
 }
@@ -108,11 +108,11 @@ 
     if ($editskillID != '') {
         $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) 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
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 
@@ -125,12 +125,12 @@ 
 
             $sql = ("INSERT INTO cr_eventPeople (eventId, userRoleId) 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
-        header('Location: index.php#section'.$editeventID);
+        header('Location: index.php#section' . $editeventID);
         exit;
     }
 }
@@ -176,7 +176,7 @@ 
                     $result = mysqli_query(db(), $mysqli_query) or die(mysqli_error(db()));
                     $row = mysqli_fetch_object($result);
 
-                    echo $row->name.'s';
+                    echo $row->name . 's';
                 } elseif ($_SESSION['onlyShowUserEvents'] == '1') {
                     echo 'My Events';
                 } else {
@@ -202,7 +202,7 @@ 
 			
 			<?php if (!empty($pendingSwaps) && $pendingSwaps > 0):
                 if ($pendingSwaps > 1) {
-                    $swapsMessage = $pendingSwaps.' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
+                    $swapsMessage = $pendingSwaps . ' swaps are pending approval. Emails have been sent to the people covering to approve the swaps.';
                 } else {
                     $swapsMessage = 'A swap is pending approval. An email has been sent to the person covering to approve the swap.';
                 } ?>
@@ -270,7 +270,7 @@ 
 							WHERE e.type = '$filter'
 							AND e.date >= DATE(NOW())
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     } else {
         $sql = "SELECT
 							DISTINCT e.id AS id,
@@ -298,7 +298,7 @@ 
 							WHERE e.date >= DATE(NOW())
 							AND ur.userId = '$view'
 							AND e.removed = 0
-							ORDER BY ".$dateOrderBy;
+							ORDER BY " . $dateOrderBy;
     }
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
 
@@ -316,7 +316,7 @@ 
         $newMonth = strftime('%B %Y', strtotime($row->sundayDate));
         if ($month != $newMonth) {
             $month = $newMonth;
-            echo '<li class="time-label"><span class="bg-green">'.$month.'</span></li>';
+            echo '<li class="time-label"><span class="bg-green">' . $month . '</span></li>';
         }
 
         // Event details?>
@@ -330,9 +330,9 @@ 
 						<h4><?php
                             echo date('jS: ', strtotime($row->sundayDate));
         if ($eventName != '') {
-            echo '<strong>'.$eventName.'</strong><br />'.$subType.' - <em>'.$type.'</em>';
+            echo '<strong>' . $eventName . '</strong><br />' . $subType . ' - <em>' . $type . '</em>';
         } else {
-            echo $subType.' - <em>'.$type.'</em>';
+            echo $subType . ' - <em>' . $type . '</em>';
         } ?>
 						</h4>
 					</a>
@@ -344,7 +344,7 @@ 
 				<?php //<p><strong>Rehearsal:</strong> <?php
                 //echo ($row->rehearsalDateFormatted = "0000-00-00 00:00:00") ? "none" : strftime(siteSettings()->time_format_normal,strtotime($row->rehearsalDateFormatted));</p>?>
 					
-				<p><strong><?php echo $row->eventGroup ? $row->eventGroup.': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '('.$row->bibleVerse.')' : '' ?></p>
+				<p><strong><?php echo $row->eventGroup ? $row->eventGroup . ': ' : '' ?></strong><?php echo $row->sermonTitle ?> <?php echo $row->bibleVerse ? '(' . $row->bibleVerse . ')' : '' ?></p>
 				
 				<p><strong>Location:</strong> <?php echo $row->eventLocation; ?></p>
 				
@@ -416,16 +416,16 @@ 
                                 } else {
                                     echo '</ul>';
                                 }
-                                echo '<p><strong>'.$groupName.'</strong></p>';
+                                echo '<p><strong>' . $groupName . '</strong></p>';
                                 echo '<ul>';
                             }
 
                             echo '<li>';
-                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=".$viewPeople->swap."'>" : '';
+                            echo (isset($viewPeople->swap)) ? "<s><a class='text-danger' href='swap.php?swap=" . $viewPeople->swap . "'>" : '';
                             echo $viewPeople->name;
 
                             if ($viewPeople->rolename != '') {
-                                echo ' - <em>'.$viewPeople->rolename.'</em>';
+                                echo ' - <em>' . $viewPeople->rolename . '</em>';
                             } else {
                                 // If there is no skill, we don't need to mention this.
                             }
@@ -451,9 +451,9 @@ 
 
 				<?php
                 if (isAdmin() || $userisBandAdmin || $userisEventEditor) {
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=".$eventID."'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
-                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=".$eventID."'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=edit&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Edit</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='createEvent.php?action=copy&id=" . $eventID . "'><i class='fa fa-pencil'></i><span> &nbsp;Copy</span></a> "; /* Edit event */
+                    echo " <a class ='btn btn-primary' href='emailEvent.php?event=" . $eventID . "'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
                 }
         if (isAdmin()) {
             //echo "<a class='btn btn-primary' href='index.php?notifyEveryone=true&eventID=$eventID'><i class='fa fa-envelope-o'></i><span> &nbsp;Send email</span></a> "; /* Send email */
@@ -462,7 +462,7 @@ 
 
             echo "<ul class='dropdown-menu'>";
 
-            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal".$eventID."'>Delete</button></li>"; /* Delete Event */
+            echo "<li><button type='button' class='btn btn-danger btn-block' data-toggle='modal' data-target='#deleteModal" . $eventID . "'>Delete</button></li>"; /* Delete Event */
 
             echo '</ul>';
         } ?>

src/classes/Controller/UserController.php

Spacing +5 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
 
     public function getUserEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/edit'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/edit'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -112,7 +112,7 @@ 
 
     public function getUser(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -127,7 +127,7 @@ 
 
     public function getUserWidgetOnly(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -142,7 +142,7 @@ 
 
     public function getUserPasswordForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/password'");
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/password'");
         $u = UserQuery::create()->findPK($args['id']);
 
         if (is_null($u)) {
@@ -157,7 +157,7 @@ 
 
     public function postUserPasswordChange(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create user POST '/user/".$args['id']."/password'");
+        $this->logger->info("Create user POST '/user/" . $args['id'] . "/password'");
 
         $data = $request->getParsedBody();
 

src/classes/Controller/EventController.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 
     public function getAllEventsWithType(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
 
         $eventType = EventTypeQuery::create()->findPk($args['id']);
 
@@ -40,7 +40,7 @@ 
 
     public function getAllEventsWithSubType(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
 
         $eventType = EventSubTypeQuery::create()->findPk($args['id']);
 
@@ -69,7 +69,7 @@ 
             $e = EventQuery::create()->findPk($args['id']);
         }
         $e->setName($data['name']);
-        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'].' '.$data['time']));
+        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'] . ' ' . $data['time']));
         $e->setEventTypeId($data['type']);
         $e->setEventSubTypeId($data['subtype']);
         $e->setLocationId($data['location']);
@@ -96,7 +96,7 @@ 
 
     public function getEvent(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "'");
         $e = EventQuery::create()->findPK($args['id']);
 
         if (!$e->authoriser()->readableBy($this->auth->currentUser())) {
@@ -112,7 +112,7 @@ 
 
     public function getEventEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/edit'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/edit'");
         $e = EventQuery::create()->findPK($args['id']);
         $l = LocationQuery::create()->orderByName()->find();
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -127,7 +127,7 @@ 
 
     public function getEventCopyForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/copy'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/copy'");
         $e = EventQuery::create()->findPK($args['id']);
         $l = LocationQuery::create()->orderByName()->find();
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -142,7 +142,7 @@ 
 
     public function getEventAssignForm(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/assign'");
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/assign'");
         $e = EventQuery::create()->findPK($args['id']);
         $ur = UserRoleQuery::create()->find();
 
@@ -155,7 +155,7 @@ 
 
     public function postEventAssign(ServerRequestInterface $request, ResponseInterface $response, $args)
     {
-        $this->logger->info("Create event people POST '/event".$args['id']."/assign'");
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/assign'");
 
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
         $existingUserRoles = UserRoleQuery::create()->useEventPersonQuery()->filterByEventId($eventId)->endUse()->find();