Completed
Push — master ( 4f2f75...b03ed7 )
by Christopher
06:52 queued 15s
created
src/classes/Controller/UserController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
     public function getUserEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
99 99
     {
100
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/edit'");
100
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/edit'");
101 101
         $u = UserQuery::create()->findPK($args['id']);
102 102
 
103 103
         if (is_null($u)) {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
     public function getUser(ServerRequestInterface $request, ResponseInterface $response, $args)
114 114
     {
115
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
115
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
116 116
         $u = UserQuery::create()->findPK($args['id']);
117 117
 
118 118
         if (is_null($u)) {
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 
128 128
     public function getUserWidgetOnly(ServerRequestInterface $request, ResponseInterface $response, $args)
129 129
     {
130
-        $this->logger->info("Fetch user GET '/user/".$args['id']."'");
130
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "'");
131 131
         $u = UserQuery::create()->findPK($args['id']);
132 132
 
133 133
         if (is_null($u)) {
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
     public function getUserPasswordForm(ServerRequestInterface $request, ResponseInterface $response, $args)
144 144
     {
145
-        $this->logger->info("Fetch user GET '/user/".$args['id']."/password'");
145
+        $this->logger->info("Fetch user GET '/user/" . $args['id'] . "/password'");
146 146
         $u = UserQuery::create()->findPK($args['id']);
147 147
 
148 148
         if (is_null($u)) {
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
     public function postUserPasswordChange(ServerRequestInterface $request, ResponseInterface $response, $args)
159 159
     {
160
-        $this->logger->info("Create user POST '/user/".$args['id']."/password'");
160
+        $this->logger->info("Create user POST '/user/" . $args['id'] . "/password'");
161 161
 
162 162
         $data = $request->getParsedBody();
163 163
 
Please login to merge, or discard this patch.
src/classes/Controller/AuthController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
     public function getLoginAuth(ServerRequestInterface $request, ResponseInterface $response, $args)
80 80
     {
81
-        $this->logger->info("Login auth GET '/login/".$args['provider']."'");
81
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "'");
82 82
 
83 83
         // login
84 84
         $authUrl = $this->auth->getCallbackUrl($this->router);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 
89 89
     public function getLoginCallback(ServerRequestInterface $request, ResponseInterface $response, $args)
90 90
     {
91
-        $this->logger->info("Login auth GET '/login/".$args['provider']."/callback'");
91
+        $this->logger->info("Login auth GET '/login/" . $args['provider'] . "/callback'");
92 92
 
93 93
         // login
94 94
         try {
Please login to merge, or discard this patch.
src/classes/AuthProvider/Callback/FacebookAuth.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
         $path = $this->router->pathFor('login-callback', ['provider' => $this->getAuthProviderSlug()]);
45 45
 
46
-        $url = $this->baseUrl.$path;
46
+        $url = $this->baseUrl . $path;
47 47
 
48 48
         return $helper->getLoginUrl($url, $this->permissions);
49 49
     }
@@ -56,12 +56,12 @@  discard block
 block discarded – undo
56 56
             $accessToken = $helper->getAccessToken();
57 57
         } catch (FacebookResponseException $e) {
58 58
             // When Graph returns an error
59
-            echo 'Graph returned an error: '.$e->getMessage();
59
+            echo 'Graph returned an error: ' . $e->getMessage();
60 60
 
61 61
             return false;
62 62
         } catch (FacebookSDKException $e) {
63 63
             // When validation fails or other local issues
64
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
64
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
65 65
 
66 66
             return false;
67 67
         }
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
         if (!isset($accessToken)) {
70 70
             if ($helper->getError()) {
71 71
                 header('HTTP/1.0 401 Unauthorized');
72
-                echo 'Error: '.$helper->getError()."\n";
73
-                echo 'Error Code: '.$helper->getErrorCode()."\n";
74
-                echo 'Error Reason: '.$helper->getErrorReason()."\n";
75
-                echo 'Error Description: '.$helper->getErrorDescription()."\n";
72
+                echo 'Error: ' . $helper->getError() . "\n";
73
+                echo 'Error Code: ' . $helper->getErrorCode() . "\n";
74
+                echo 'Error Reason: ' . $helper->getErrorReason() . "\n";
75
+                echo 'Error Description: ' . $helper->getErrorDescription() . "\n";
76 76
             } else {
77 77
                 header('HTTP/1.0 400 Bad Request');
78 78
                 echo 'Bad request';
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             try {
99 99
                 $accessToken = $oAuth2Client->getLongLivedAccessToken($accessToken);
100 100
             } catch (FacebookSDKException $e) {
101
-                echo '<p>Error getting long-lived access token: '.$helper->getMessage()."</p>\n\n";
101
+                echo '<p>Error getting long-lived access token: ' . $helper->getMessage() . "</p>\n\n";
102 102
 
103 103
                 return false;
104 104
             }
@@ -122,10 +122,10 @@  discard block
 block discarded – undo
122 122
             // Returns a `Facebook\FacebookResponse` object
123 123
             $response = $this->facebook->get('/me?fields=id,name,email', $accessToken);
124 124
         } catch (Facebook\Exceptions\FacebookResponseException $e) {
125
-            echo 'Graph returned an error: '.$e->getMessage();
125
+            echo 'Graph returned an error: ' . $e->getMessage();
126 126
             exit;
127 127
         } catch (Facebook\Exceptions\FacebookSDKException $e) {
128
-            echo 'Facebook SDK returned an error: '.$e->getMessage();
128
+            echo 'Facebook SDK returned an error: ' . $e->getMessage();
129 129
             exit;
130 130
         }
131 131
 
Please login to merge, or discard this patch.
src/dependencies.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $container = $app->getContainer();
20 20
 
21 21
 // TWIG view renderer
22
-$container['view'] = function ($c) {
22
+$container['view'] = function($c) {
23 23
     $settings = $c->get('settings')['renderer'];
24 24
     $view = new Twig($settings['template_path'], [
25 25
         'cache' => false, // or 'path/to/cache'
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     $env = $view->getEnvironment();
42 42
     $env->addGlobal('site', new Site());
43 43
     $env->addGlobal('currenturl', $c->get('request')->getUri());
44
-    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath().'/'.$c->get('request')->getUri()->getPath());
44
+    $env->addGlobal('currentpath', $c->get('request')->getUri()->getBasePath() . '/' . $c->get('request')->getUri()->getPath());
45 45
 
46 46
     if (isset($_SESSION['userId'])) {
47 47
         $u = UserQuery::create()->findPk($_SESSION['userId']);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 };
55 55
 
56 56
 // monolog
57
-$container['logger'] = function ($c) {
57
+$container['logger'] = function($c) {
58 58
     $settings = $c->get('settings')['logger'];
59 59
     $logger = new Monolog\Logger($settings['name']);
60 60
     $logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     return $logger;
64 64
 };
65 65
 
66
-$container['auth'] = function ($c) {
66
+$container['auth'] = function($c) {
67 67
     $authConfig = getConfig()['auth'];
68 68
 
69 69
     // full domain e.g. https://example.com
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             break;
82 82
 
83 83
         case 'onebody':
84
-            $url = $authConfig['onebody']['url'].'/';
84
+            $url = $authConfig['onebody']['url'] . '/';
85 85
             $email = new EmailAddress($authConfig['onebody']['email']);
86 86
             $apiKey = $authConfig['onebody']['apiKey'];
87 87
 
Please login to merge, or discard this patch.
src/classes/Controller/GroupController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function getGroup(ServerRequestInterface $request, ResponseInterface $response, $args)
14 14
     {
15
-        $this->logger->info("Fetch group GET '/group/".$args['id']."'");
15
+        $this->logger->info("Fetch group GET '/group/" . $args['id'] . "'");
16 16
         $events = EventQuery::create()
17 17
             ->useEventPersonQuery()
18 18
                 ->useUserRoleQuery()
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
     public function getGroupRoles(ServerRequestInterface $request, ResponseInterface $response, $args)
40 40
     {
41
-        $this->logger->info("Fetch group roles GET '/group/".$args['id']."/roles'");
41
+        $this->logger->info("Fetch group roles GET '/group/" . $args['id'] . "/roles'");
42 42
         $events = EventQuery::create()
43 43
             ->useEventPersonQuery()
44 44
                 ->useUserRoleQuery()
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                 ->findPk($args['id']);
61 61
 
62 62
         // temporary redirect
63
-        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home').'old/roles.php');
63
+        return $response->withStatus(302)->withHeader('Location', $this->router->pathFor('home') . 'old/roles.php');
64 64
 
65 65
         return $this->view->render($response, 'group-roles.twig', ['events' => $events, 'group' => $group]);
66 66
     }
Please login to merge, or discard this patch.
src/routes.php 1 patch
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -20,35 +20,35 @@  discard block
 block discarded – undo
20 20
 // USER
21 21
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22 22
 
23
-$app->group('/user', function () {
24
-    $this->get('s', UserController::class.':getAllUsers')->setName('users');
23
+$app->group('/user', function() {
24
+    $this->get('s', UserController::class . ':getAllUsers')->setName('users');
25 25
 
26
-    $this->get('/{id}/widget-only', UserController::class.':getUserWidgetOnly')->setName('user-widget-only');
26
+    $this->get('/{id}/widget-only', UserController::class . ':getUserWidgetOnly')->setName('user-widget-only');
27 27
 
28
-    $this->get('/new', UserController::class.':getNewUserForm')->setName('user-new');
29
-    $this->get('/{id}/edit', UserController::class.':getUserEditForm')->setName('user-edit');
30
-    $this->get('/{id}/password', UserController::class.':getUserPasswordForm')->setName('user-password');
28
+    $this->get('/new', UserController::class . ':getNewUserForm')->setName('user-new');
29
+    $this->get('/{id}/edit', UserController::class . ':getUserEditForm')->setName('user-edit');
30
+    $this->get('/{id}/password', UserController::class . ':getUserPasswordForm')->setName('user-password');
31 31
 
32
-    $this->get('/me', UserController::class.':getCurrentUser')->setName('user-me');
33
-    $this->get('/{id}', UserController::class.':getUser')->setName('user');
32
+    $this->get('/me', UserController::class . ':getCurrentUser')->setName('user-me');
33
+    $this->get('/{id}', UserController::class . ':getUser')->setName('user');
34 34
 
35
-    $this->post('[/{id}]', UserController::class.':postUser')->setName('user-post');
36
-    $this->post('/{id}/password', UserController::class.':postUserPasswordChange')->setName('user-password-post');
35
+    $this->post('[/{id}]', UserController::class . ':postUser')->setName('user-post');
36
+    $this->post('/{id}/password', UserController::class . ':postUserPasswordChange')->setName('user-password-post');
37 37
 
38 38
     // roles
39
-    $this->get('/{id}/roles', RoleController::class.':getAssignRolesForm')->setName('user-roles');
40
-    $this->post('/{id}/roles', RoleController::class.':postUserAssignRoles')->setName('user-assign-post');
39
+    $this->get('/{id}/roles', RoleController::class . ':getAssignRolesForm')->setName('user-roles');
40
+    $this->post('/{id}/roles', RoleController::class . ':postUserAssignRoles')->setName('user-assign-post');
41 41
 
42 42
     // availability
43
-    $this->get('/{id}/availability', AvailabilityController::class.':getAvailabilityForm')->setName('user-availability');
44
-    $this->post('/{id}/availability', AvailabilityController::class.':postAvailability')->setName('user-availability-post');
43
+    $this->get('/{id}/availability', AvailabilityController::class . ':getAvailabilityForm')->setName('user-availability');
44
+    $this->post('/{id}/availability', AvailabilityController::class . ':postAvailability')->setName('user-availability-post');
45 45
 
46 46
     // calendar
47
-    $this->group('/me/calendar', function () {
48
-        $this->get('s', CalendarController::class.':getCalendarTokens')->setName('user-calendars');
49
-        $this->get('/new', CalendarController::class.':getNewCalendarForm')->setName('user-calendars');
50
-        $this->get('/{id}/revoke', CalendarController::class.':getRevokeCalendar')->setName('user-calendar-revoke');
51
-        $this->post('/new', CalendarController::class.':postNewCalendar')->setName('user-calendar-new-post');
47
+    $this->group('/me/calendar', function() {
48
+        $this->get('s', CalendarController::class . ':getCalendarTokens')->setName('user-calendars');
49
+        $this->get('/new', CalendarController::class . ':getNewCalendarForm')->setName('user-calendars');
50
+        $this->get('/{id}/revoke', CalendarController::class . ':getRevokeCalendar')->setName('user-calendar-revoke');
51
+        $this->post('/new', CalendarController::class . ':postNewCalendar')->setName('user-calendar-new-post');
52 52
     });
53 53
 });
54 54
 
@@ -56,95 +56,95 @@  discard block
 block discarded – undo
56 56
 // EVENT
57 57
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58 58
 
59
-$app->group('/event', function () {
60
-    $this->get('s', EventController::class.':getAllEvents')->setName('events');
61
-    $this->get('s/type/{id}', EventController::class.':getAllEventsWithType')->setName('events-eventtype');
62
-    $this->get('s/subtype/{id}', EventController::class.':getAllEventsWithSubType')->setName('events-eventsubtype');
59
+$app->group('/event', function() {
60
+    $this->get('s', EventController::class . ':getAllEvents')->setName('events');
61
+    $this->get('s/type/{id}', EventController::class . ':getAllEventsWithType')->setName('events-eventtype');
62
+    $this->get('s/subtype/{id}', EventController::class . ':getAllEventsWithSubType')->setName('events-eventsubtype');
63 63
 
64
-    $this->get('s/print/preachers', EventController::class.':getAllEventsToPrint')->setName('events-print');
64
+    $this->get('s/print/preachers', EventController::class . ':getAllEventsToPrint')->setName('events-print');
65 65
 
66
-    $this->get('/new', EventController::class.':getNewEventForm')->setName('event-new');
67
-    $this->get('/{id}/edit', EventController::class.':getEventEditForm')->setName('event-edit');
68
-    $this->get('/{id}/copy', EventController::class.':getEventCopyForm')->setName('event-copy');
69
-    $this->get('/{id}/assign', EventController::class.':getEventAssignForm')->setName('event-assign');
66
+    $this->get('/new', EventController::class . ':getNewEventForm')->setName('event-new');
67
+    $this->get('/{id}/edit', EventController::class . ':getEventEditForm')->setName('event-edit');
68
+    $this->get('/{id}/copy', EventController::class . ':getEventCopyForm')->setName('event-copy');
69
+    $this->get('/{id}/assign', EventController::class . ':getEventAssignForm')->setName('event-assign');
70 70
 
71
-    $this->get('/{id}', EventController::class.':getEvent')->setName('event');
71
+    $this->get('/{id}', EventController::class . ':getEvent')->setName('event');
72 72
 
73
-    $this->post('[/{id}]', EventController::class.':postEvent')->setName('event-post');
74
-    $this->post('/{id}/assign', EventController::class.':postEventAssign')->setName('event-assign-post');
73
+    $this->post('[/{id}]', EventController::class . ':postEvent')->setName('event-post');
74
+    $this->post('/{id}/assign', EventController::class . ':postEventAssign')->setName('event-assign-post');
75 75
 });
76 76
 
77 77
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
78 78
 // RESOURCE
79 79
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
80 80
 
81
-$app->group('/resource', function () {
82
-    $this->get('s', ResourceController::class.':getAllResources')->setName('resources');
81
+$app->group('/resource', function() {
82
+    $this->get('s', ResourceController::class . ':getAllResources')->setName('resources');
83 83
 
84
-    $this->get('[/new]', ResourceController::class.':getNewResourceForm')->setName('resource-new');
85
-    $this->get('/{id}/edit', ResourceController::class.':getResourceEditForm')->setName('resource-edit');
84
+    $this->get('[/new]', ResourceController::class . ':getNewResourceForm')->setName('resource-new');
85
+    $this->get('/{id}/edit', ResourceController::class . ':getResourceEditForm')->setName('resource-edit');
86 86
 
87
-    $this->get('/{id}', ResourceController::class.':getResourceFile')->setName('resource');
87
+    $this->get('/{id}', ResourceController::class . ':getResourceFile')->setName('resource');
88 88
 
89
-    $this->post('[/{id}]', ResourceController::class.':postResource')->setName('resource-post');
89
+    $this->post('[/{id}]', ResourceController::class . ':postResource')->setName('resource-post');
90 90
 });
91 91
 
92 92
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
93 93
 // ROLES & GROUPS
94 94
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
95 95
 
96
-$app->group('/group', function () {
97
-    $this->get('/{id}', GroupController::class.':getGroup')->setName('group');
98
-    $this->get('/{id}/roles', GroupController::class.':getGroupRoles')->setName('group-roles');
96
+$app->group('/group', function() {
97
+    $this->get('/{id}', GroupController::class . ':getGroup')->setName('group');
98
+    $this->get('/{id}/roles', GroupController::class . ':getGroupRoles')->setName('group-roles');
99 99
 });
100 100
 
101 101
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
102 102
 // AUTH
103 103
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
104 104
 
105
-$app->get('/login', AuthController::class.':getLoginForm')->setName('login');
105
+$app->get('/login', AuthController::class . ':getLoginForm')->setName('login');
106 106
 
107
-$app->get('/login/{provider}', AuthController::class.':getLoginAuth')->setName('login-auth');
108
-$app->get('/login/{provider}/callback', AuthController::class.':getLoginCallback')->setName('login-callback');
109
-$app->get('/signup', PendingUserController::class.':getSignUpForm')->setName('sign-up');
110
-$app->get('/signup/cancel', PendingUserController::class.':getSignUpCancel')->setName('sign-up-cancel');
107
+$app->get('/login/{provider}', AuthController::class . ':getLoginAuth')->setName('login-auth');
108
+$app->get('/login/{provider}/callback', AuthController::class . ':getLoginCallback')->setName('login-callback');
109
+$app->get('/signup', PendingUserController::class . ':getSignUpForm')->setName('sign-up');
110
+$app->get('/signup/cancel', PendingUserController::class . ':getSignUpCancel')->setName('sign-up-cancel');
111 111
 
112
-$app->get('/logout', AuthController::class.':getLogout')->setName('logout');
112
+$app->get('/logout', AuthController::class . ':getLogout')->setName('logout');
113 113
 
114
-$app->post('/login', AuthController::class.':postLogin')->setName('login-post');
115
-$app->post('/signup', PendingUserController::class.':postSignUp')->setName('sign-up-post');
114
+$app->post('/login', AuthController::class . ':postLogin')->setName('login-post');
115
+$app->post('/signup', PendingUserController::class . ':postSignUp')->setName('sign-up-post');
116 116
 
117 117
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
118 118
 // NOTIFICATIONS
119 119
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
120 120
 
121
-$app->get('/notification/{id}[/{referrer}]', NotificationController::class.':getNotificationClick')->setName('notification');
121
+$app->get('/notification/{id}[/{referrer}]', NotificationController::class . ':getNotificationClick')->setName('notification');
122 122
 
123 123
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
124 124
 // CALENDAR
125 125
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
126 126
 
127
-$app->get('/calendar/{token}.{format}', CalendarController::class.':getRenderedCalendar')->setName('user-calendar');
127
+$app->get('/calendar/{token}.{format}', CalendarController::class . ':getRenderedCalendar')->setName('user-calendar');
128 128
 
129 129
 // legacy
130
-$app->get('/calendar.php', CalendarController::class.':getLegacyRenderedCalendar')->setName('user-calendar');
130
+$app->get('/calendar.php', CalendarController::class . ':getLegacyRenderedCalendar')->setName('user-calendar');
131 131
 
132 132
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
133 133
 // OTHER
134 134
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
135 135
 
136
-$app->get('/settings', function ($request, $response, $args) {
136
+$app->get('/settings', function($request, $response, $args) {
137 137
     // Sample log message
138 138
     $this->logger->info("Fetch settings GET '/settings'");
139 139
 
140 140
     return $this->view->render($response, 'settings.twig', []);
141 141
 })->setName('settings');
142 142
 
143
-$app->get('/token', function ($request, $response, $args) {
143
+$app->get('/token', function($request, $response, $args) {
144 144
     return $response->getBody()->write(Crypt::generateToken(30));
145 145
 })->setName('token');
146 146
 
147
-$app->get('/', function ($request, $response, $args) {
147
+$app->get('/', function($request, $response, $args) {
148 148
     // Sample log message
149 149
     $this->logger->info("Fetch home GET '/'");
150 150
 
Please login to merge, or discard this patch.
public/old/tableView.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 									 FROM cr_eventTypes et
112 112
 									 WHERE id IN (SELECT e.type
113 113
 										 						FROM cr_events e
114
-																WHERE '.$whereTwoMonth.'
114
+																WHERE '.$whereTwoMonth . '
115 115
 																AND e.removed = 0)
116 116
 									 ORDER BY name';
117 117
         $result = mysqli_query(db(), $filter_sql) or die(mysqli_error(db()));
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 <tr>
133 133
 	<td ><strong>Event</strong></td>
134 134
 	<?php
135
-    $sql = 'SELECT * FROM cr_groups g ORDER BY '.$group_sorting_name;
135
+    $sql = 'SELECT * FROM cr_groups g ORDER BY ' . $group_sorting_name;
136 136
     $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
137 137
 
138 138
     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 
163 163
     if ($filter == '') {
164 164
         $sql .= '
165
-							AND '.$whereTwoMonth.'
165
+							AND '.$whereTwoMonth . '
166 166
 						ORDER BY
167 167
 							e.date';
168 168
     } elseif ($filter == 'all') {
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     } elseif ($filter != '') {
173 173
         $sql .= "
174 174
 							AND e.type = '$filter'
175
-							AND ".$whereTwoMonth.'
175
+							AND " . $whereTwoMonth . '
176 176
 						ORDER BY
177 177
 							e.date';
178 178
     }
@@ -186,31 +186,31 @@  discard block
 block discarded – undo
186 186
         echo '<tr>';
187 187
         echo '<td >';
188 188
         setlocale(LC_TIME, $lang_locale); //de_DE
189
-        echo '<a href="event.php?id='.$row['id'].'">';
189
+        echo '<a href="event.php?id=' . $row['id'] . '">';
190 190
         echo strftime($time_format_short, strtotime($row['sundayDate'])); // %a, <strong>%e. %b</strong>, KW%V
191 191
         echo '</a>';
192 192
 
193 193
         //$row['sundayDate']
194 194
         if (!empty($row['eventType'])) {
195
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventType'].'</em>';
195
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventType'] . '</em>';
196 196
         }
197 197
         if (!empty($row['eventSubType'])) {
198
-            echo ' - <em>'.$row['eventSubType'].'</em>';
198
+            echo ' - <em>' . $row['eventSubType'] . '</em>';
199 199
         }
200 200
         if (!empty($row['eventLocation'])) {
201
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['eventLocation'].'</em>';
201
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['eventLocation'] . '</em>';
202 202
         }
203 203
         if (!empty($row['name'])) {
204
-            echo '<br /><em>&nbsp;&nbsp;&nbsp;'.$row['name'].'</em>';
204
+            echo '<br /><em>&nbsp;&nbsp;&nbsp;' . $row['name'] . '</em>';
205 205
         }
206 206
         if (!empty($row['eventGroup'])) {
207
-            echo '<br /><strong>&nbsp;&nbsp;&nbsp;'.$row['eventGroup'].'</strong>';
207
+            echo '<br /><strong>&nbsp;&nbsp;&nbsp;' . $row['eventGroup'] . '</strong>';
208 208
         }
209 209
         if (!empty($row['sermonTitle'])) {
210
-            echo ': '.$row['sermonTitle'];
210
+            echo ': ' . $row['sermonTitle'];
211 211
         }
212 212
         if (!empty($row['bibleVerse'])) {
213
-            echo ' <em>('.$row['bibleVerse'].')</em>';
213
+            echo ' <em>(' . $row['bibleVerse'] . ')</em>';
214 214
         }
215 215
         echo '</td>';
216 216
 
@@ -242,16 +242,16 @@  discard block
 block discarded – undo
242 242
                     if ($previousName == '') {
243 243
                         // new name
244 244
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
245
-                        echo $name.' <em>('.$viewPeople['role'];
245
+                        echo $name . ' <em>(' . $viewPeople['role'];
246 246
                     } elseif ($previousName != $name) {
247 247
                         echo ')</em>';
248 248
                         echo ($viewPeople['userId'] != $sessionUserId) ? '</strong>' : '';
249 249
                         echo '<br />'; // line break from previous name
250 250
                         // new name
251 251
                         echo ($viewPeople['userId'] == $sessionUserId) ? '<strong class="me">' : '';
252
-                        echo $name.' <em>('.$viewPeople['role'];
252
+                        echo $name . ' <em>(' . $viewPeople['role'];
253 253
                     } else {
254
-                        echo ', '.$viewPeople['role'];
254
+                        echo ', ' . $viewPeople['role'];
255 255
                     }
256 256
 
257 257
                     $peopleInEvent = true;
Please login to merge, or discard this patch.
public/old/event.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 if (!empty($_GET['id'])) {
4
-    header('Location: ../event/'.(int) $_GET['id']);
4
+    header('Location: ../event/' . (int) $_GET['id']);
5 5
 }
Please login to merge, or discard this patch.
src/classes/Controller/EventController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function getAllEventsWithType(ServerRequestInterface $request, ResponseInterface $response, $args)
33 33
     {
34
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
34
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
35 35
 
36 36
         $eventType = EventTypeQuery::create()->findPk($args['id']);
37 37
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
     public function getAllEventsWithSubType(ServerRequestInterface $request, ResponseInterface $response, $args)
44 44
     {
45
-        $this->logger->info("Fetch event GET '/events/type/".$args['id']."'");
45
+        $this->logger->info("Fetch event GET '/events/type/" . $args['id'] . "'");
46 46
 
47 47
         $eventType = EventSubTypeQuery::create()->findPk($args['id']);
48 48
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
             $e->setCreatedBy($this->auth->currentUser());
86 86
         }
87 87
         $e->setName($data['name']);
88
-        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'].' '.$data['time']));
88
+        $e->setDate(DateTime::createFromFormat('d/m/Y H:i', $data['date'] . ' ' . $data['time']));
89 89
         $e->setEventTypeId($data['type']);
90 90
         $e->setEventSubTypeId($data['subtype']);
91 91
         $e->setLocationId($data['location']);
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
     public function getEvent(ServerRequestInterface $request, ResponseInterface $response, $args)
120 120
     {
121
-        $this->logger->info("Fetch event GET '/event/".$args['id']."'");
121
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "'");
122 122
         $e = EventQuery::create()->findPK($args['id']);
123 123
 
124 124
         if (!$e->authoriser()->readableBy($this->auth->currentUser())) {
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
     public function getEventEditForm(ServerRequestInterface $request, ResponseInterface $response, $args)
136 136
     {
137
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/edit'");
137
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/edit'");
138 138
         $e = EventQuery::create()->findPK($args['id']);
139 139
         $l = LocationQuery::create()->orderByName()->find();
140 140
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 
150 150
     public function getEventCopyForm(ServerRequestInterface $request, ResponseInterface $response, $args)
151 151
     {
152
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/copy'");
152
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/copy'");
153 153
         $e = EventQuery::create()->findPK($args['id']);
154 154
         $l = LocationQuery::create()->orderByName()->find();
155 155
         $et = EventTypeQuery::create()->orderByName()->find();
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 
165 165
     public function getEventAssignForm(ServerRequestInterface $request, ResponseInterface $response, $args)
166 166
     {
167
-        $this->logger->info("Fetch event GET '/event/".$args['id']."/assign'");
167
+        $this->logger->info("Fetch event GET '/event/" . $args['id'] . "/assign'");
168 168
         $e = EventQuery::create()->findPK($args['id']);
169 169
         $ur = UserRoleQuery::create()->find();
170 170
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
     public function postEventAssign(ServerRequestInterface $request, ResponseInterface $response, $args)
179 179
     {
180
-        $this->logger->info("Create event people POST '/event".$args['id']."/assign'");
180
+        $this->logger->info("Create event people POST '/event" . $args['id'] . "/assign'");
181 181
 
182 182
         $eventId = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
183 183
         $existingUserRoles = UserRoleQuery::create()->useEventPersonQuery()->filterByEventId($eventId)->endUse()->find();
Please login to merge, or discard this patch.