Completed
Branch master (a049c8)
by Christopher
12:07
created
public/old/includes/functions.database.php 2 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,6 @@
 block discarded – undo
2 2
 
3 3
 namespace TechWilk\Rota;
4 4
 
5
-use DateTime;
6
-
7 5
 /*
8 6
     This file is part of Church Rota.
9 7
 
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 function executeDbSql($sql)
27 27
 {
28 28
     if (!mysqli_query(db(), $sql)) {
29
-        die('Error: '.mysqli_error(db()).', SQL: '.$sql);
29
+        die('Error: ' . mysqli_error(db()) . ', SQL: ' . $sql);
30 30
     }
31 31
 }
32 32
 
33 33
 function updateDatabase()
34 34
 {
35 35
     $sql = 'SELECT VERSION( ) AS mysqli_version';
36
-    $result = mysqli_query(db(), $sql) or die('MySQL-Error: '.mysqli_error(db()));
36
+    $result = mysqli_query(db(), $sql) or die('MySQL-Error: ' . mysqli_error(db()));
37 37
     $dbv = mysqli_fetch_array($result, MYSQLI_ASSOC);
38 38
     $mysqli_version = $dbv['mysqli_version'];
39 39
     //echo $mysqli_version."<br>";
@@ -87,41 +87,41 @@  discard block
 block discarded – undo
87 87
             executeDbSql("alter table cr_users add(isOverviewRecipient char(2) NOT NULL DEFAULT '0')");
88 88
             executeDbSql('alter table cr_groups add(short_name char(2))');
89 89
 
90
-            executeDbSql("update cr_settings set lang_locale = 'en_GB'");                     // de_DE
90
+            executeDbSql("update cr_settings set lang_locale = 'en_GB'"); // de_DE
91 91
             executeDbSql('update cr_settings set event_sorting_latest = 0');
92 92
             executeDbSql('update cr_settings set snapshot_show_two_month = 0');
93 93
             executeDbSql('update cr_settings set snapshot_reduce_skills_by_group = 0');
94 94
             executeDbSql('update cr_settings set logged_in_show_snapshot_button = 0');
95 95
             executeDbSql("update cr_settings set time_format_long = '%A, %B %e @ %I:%M %p'"); // de_DE: %A, %e. %B %Y, %R Uhr, KW%V
96 96
             executeDbSql("update cr_settings set time_format_normal = '%m/%d/%y %I:%M %p'"); // de_DE: %d.%m.%Y %H:%M
97
-            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
97
+            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
98 98
             executeDbSql("update cr_settings set version = '2.1.0'");
99 99
             executeDbSql('update cr_settings set users_start_with_myevents = 0');
100 100
             executeDbSql("update cr_settings set time_zone = 'Europe/London'"); //de_DE: Europe/Berlin
101 101
             executeDbSql("update cr_settings set google_group_calendar = ''");
102 102
             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'");
103 103
 
104
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.0', $_SESSION['userid']);
104
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.0', $_SESSION['userid']);
105 105
         case '2.1.0':
106 106
             executeDbSql('create table cr_settings_bkp2_1_0 as select * from cr_settings');
107 107
             executeDbSql('alter table cr_settings add(group_sorting_name int(1))');
108 108
             executeDbSql("update cr_settings set version = '2.1.1'");
109
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.1', $_SESSION['userid']);
109
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.1', $_SESSION['userid']);
110 110
         case '2.1.1':
111 111
             executeDbSql("update cr_settings set version = '2.1.2'");
112
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.1.2', $_SESSION['userid']);
112
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.1.2', $_SESSION['userid']);
113 113
         case '2.1.2':
114 114
             executeDbSql("alter table cr_settings add(debug_mode int(1) DEFAULT '0')");
115
-            executeDbSql('update cr_settings set group_sorting_name = 0');  //was a workaround, fixed in V2.2.1
115
+            executeDbSql('update cr_settings set group_sorting_name = 0'); //was a workaround, fixed in V2.2.1
116 116
 
117 117
             executeDbSql("update cr_settings set version = '2.2.0'");
118
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.0', $_SESSION['userid']);
118
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.0', $_SESSION['userid']);
119 119
         case '2.2.0':
120 120
             executeDbSql("alter table cr_users add(isBandAdmin char(2) NOT NULL DEFAULT '0')");
121 121
             executeDbSql('update cr_settings set group_sorting_name = 0'); //due to an error reset it again
122 122
 
123 123
             executeDbSql("update cr_settings set version = '2.2.1'");
124
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.2.1', $_SESSION['userid']);
124
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.2.1', $_SESSION['userid']);
125 125
         case '2.2.1':
126 126
                 $sql = "CREATE TABLE IF NOT EXISTS `cr_statistics` (
127 127
 				  `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -137,21 +137,21 @@  discard block
 block discarded – undo
137 137
             executeDbSql($sql);
138 138
 
139 139
             executeDbSql("update cr_settings set version = '2.3.0'");
140
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.0', $_SESSION['userid']);
140
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.0', $_SESSION['userid']);
141 141
             insertStatistics('system', __FILE__, 'db-update', '2.3.0', $version);
142 142
         case '2.3.0':
143 143
             executeDbSql("alter table cr_users add(isEventEditor char(2) NOT NULL DEFAULT '0')");
144 144
 
145 145
             executeDbSql("update cr_settings set version = '2.3.1'");
146
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.1', $_SESSION['userid']);
146
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.1', $_SESSION['userid']);
147 147
             insertStatistics('system', __FILE__, 'db-update', '2.3.1', $version);
148 148
         case '2.3.1':
149 149
             executeDbSql("update cr_settings set version = '2.3.2'");
150
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.2', $_SESSION['userid']);
150
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.2', $_SESSION['userid']);
151 151
             insertStatistics('system', __FILE__, 'db-update', '2.3.2', $version);
152 152
         case '2.3.2':
153 153
             executeDbSql("update cr_settings set version = '2.3.3'");
154
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.3', $_SESSION['userid']);
154
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.3', $_SESSION['userid']);
155 155
             insertStatistics('system', __FILE__, 'db-update', '2.3.3', $version);
156 156
         case '2.3.3':
157 157
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -199,33 +199,33 @@  discard block
 block discarded – undo
199 199
                     );
200 200
             }
201 201
             executeDbSql("update cr_settings set version = '2.3.4'");
202
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.4', $_SESSION['userid']);
202
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.4', $_SESSION['userid']);
203 203
             insertStatistics('system', __FILE__, 'db-update', '2.3.4', $version);
204 204
         case '2.3.4':
205 205
             executeDbSql("update cr_settings set version = '2.3.5'");
206
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.3.5', $_SESSION['userid']);
206
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.3.5', $_SESSION['userid']);
207 207
             insertStatistics('system', __FILE__, 'db-update', '2.3.5', $version);
208 208
         case '2.3.5':
209 209
             executeDbSql("update cr_settings set version = '2.4.0'");
210
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.0', $_SESSION['userid']);
210
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.0', $_SESSION['userid']);
211 211
             insertStatistics('system', __FILE__, 'db-update', '2.4.0', $version);
212 212
         case '2.4.0':
213 213
             executeDbSql("update cr_settings set version = '2.4.1'");
214
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.1', $_SESSION['userid']);
214
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.1', $_SESSION['userid']);
215 215
             insertStatistics('system', __FILE__, 'db-update', '2.4.1', $version);
216 216
         case '2.4.1':
217 217
             executeDbSql('alter table cr_settings add(days_to_alert int(2) DEFAULT 5) ');
218 218
             executeDbSql("alter table cr_settings add(token varchar(100) DEFAULT '') ");
219 219
             executeDbSql("update cr_settings set version = '2.4.2'");
220
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.2', $_SESSION['userid']);
220
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.2', $_SESSION['userid']);
221 221
             insertStatistics('system', __FILE__, 'db-update', '2.4.2', $version);
222 222
         case '2.4.2':
223 223
             executeDbSql("update cr_settings set version = '2.4.3'");
224
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.3', $_SESSION['userid']);
224
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.3', $_SESSION['userid']);
225 225
             insertStatistics('system', __FILE__, 'db-update', '2.4.3', $version);
226 226
         case '2.4.3':
227 227
             executeDbSql("update cr_settings set version = '2.4.4'");
228
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.4', $_SESSION['userid']);
228
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.4', $_SESSION['userid']);
229 229
             insertStatistics('system', __FILE__, 'db-update', '2.4.4', $version);
230 230
         case '2.4.4':
231 231
             if (substr($mysqli_version, 0, 1) == 5) {
@@ -274,27 +274,27 @@  discard block
 block discarded – undo
274 274
                 );
275 275
             }
276 276
             executeDbSql("update cr_settings set version = '2.4.5'");
277
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.4.5', $_SESSION['userid']);
277
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.4.5', $_SESSION['userid']);
278 278
             insertStatistics('system', __FILE__, 'db-update', '2.4.5', $version);
279 279
         case '2.4.5':
280 280
             executeDbSql("update cr_settings set version = '2.5.0'");
281
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.0', $_SESSION['userid']);
281
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.0', $_SESSION['userid']);
282 282
             insertStatistics('system', __FILE__, 'db-update', '2.5.0', $version);
283 283
         case '2.5.0':
284 284
             executeDbSql("update cr_settings set version = '2.5.1'");
285
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.1', $_SESSION['userid']);
285
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.1', $_SESSION['userid']);
286 286
             insertStatistics('system', __FILE__, 'db-update', '2.5.1', $version);
287 287
         case '2.5.1':
288 288
             executeDbSql("update cr_settings set version = '2.5.2'");
289
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.2', $_SESSION['userid']);
289
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.2', $_SESSION['userid']);
290 290
             insertStatistics('system', __FILE__, 'db-update', '2.5.2', $version);
291 291
         case '2.5.2':
292 292
             executeDbSql("update cr_settings set version = '2.5.3'");
293
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.5.3', $_SESSION['userid']);
293
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.5.3', $_SESSION['userid']);
294 294
             insertStatistics('system', __FILE__, 'db-update', '2.5.3', $version);
295 295
         case '2.5.3':
296 296
             executeDbSql("update cr_settings set version = '2.6.0'");
297
-            notifyInfo(__FILE__, 'db-update='.$version.'->2.6.0', $_SESSION['userid']);
297
+            notifyInfo(__FILE__, 'db-update=' . $version . '->2.6.0', $_SESSION['userid']);
298 298
             insertStatistics('system', __FILE__, 'db-update', '2.6.0', $version);
299 299
         case '2.6.0':
300 300
             $sql = "ALTER TABLE cr_users
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
             executeDbSql($sql);
371 371
             executeDbSql("update cr_settings set version = '3.0.0-pre1'");
372 372
 
373
-            notifyInfo(__FILE__, 'db-update='.$version.'->3.0.0-pre1', $_SESSION['userid']);
373
+            notifyInfo(__FILE__, 'db-update=' . $version . '->3.0.0-pre1', $_SESSION['userid']);
374 374
             insertStatistics('system', __FILE__, 'db-update', '3.0.0-pre1', $version);
375 375
         case '3.0.0-pre1':
376 376
             $sql = "CREATE TABLE IF NOT EXISTS cr_notifications (
Please login to merge, or discard this patch.
public/api/v1/index.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -23,15 +23,15 @@  discard block
 block discarded – undo
23 23
 // Start of API
24 24
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
25 25
 
26
-require_once dirname(__FILE__).'/../../../vendor/autoload.php';
26
+require_once dirname(__FILE__) . '/../../../vendor/autoload.php';
27 27
 
28
-include_once dirname(__FILE__).'/../../../config/database.php';
28
+include_once dirname(__FILE__) . '/../../../config/database.php';
29 29
 
30 30
 // Create and configure Slim app
31 31
 $app = new \Slim\App(['settings' => $config]);
32 32
 
33
-spl_autoload_register(function ($classname) {
34
-    require dirname(__FILE__).'/../../../api-classes/'.$classname.'.php';
33
+spl_autoload_register(function($classname) {
34
+    require dirname(__FILE__) . '/../../../api-classes/' . $classname . '.php';
35 35
 });
36 36
 
37 37
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 $container = $app->getContainer();
42 42
 
43
-$container['db'] = function ($c) {
43
+$container['db'] = function($c) {
44 44
     $db_config = $c['settings']['db'];
45 45
     $db = new Database($db_config);
46 46
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 // ~~~~~~~~~~~~~~~ Event ~~~~~~~~~~~~~~~
55 55
 
56
-$app->post('/events', function ($request, $response, $args) {
56
+$app->post('/events', function($request, $response, $args) {
57 57
     $postData = $request->getParsedBody();
58 58
 
59 59
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
     return $response->withJson($data);
66 66
 });
67 67
 
68
-$app->get('/events/{id}', function ($request, $response, $args) {
68
+$app->get('/events/{id}', function($request, $response, $args) {
69 69
     $id = filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
70 70
 
71 71
     $event = new Event();
@@ -91,8 +91,8 @@  discard block
 block discarded – undo
91 91
                     'relationships' => [
92 92
                                         'series' => [
93 93
                                                     'links' => [
94
-                                                                'self'    => '/events/'.$event->getId().'/relationships/series',
95
-                                                                'related' => '/events/'.$event->getId().'/series/'.$series->getId(),
94
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/series',
95
+                                                                'related' => '/events/' . $event->getId() . '/series/' . $series->getId(),
96 96
                                                     ],
97 97
                                                     'data' => [
98 98
                                                       'type' => 'series',
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
                                         ],
102 102
                                         'types' => [
103 103
                                                     'links' => [
104
-                                                                'self'    => '/events/'.$event->getId().'/relationships/types',
105
-                                                                'related' => '/events/'.$event->getId().'/types/'.$type->getId(),
104
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/types',
105
+                                                                'related' => '/events/' . $event->getId() . '/types/' . $type->getId(),
106 106
                                                     ],
107 107
                                                     'data' => [
108 108
                                                       'type' => 'types',
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
                                         ],
112 112
                                         'sub-types' => [
113 113
                                                     'links' => [
114
-                                                                'self'    => '/events/'.$event->getId().'/relationships/sub-types',
115
-                                                                'related' => '/events/'.$event->getId().'/sub-types/'.$sub_type->getId(),
114
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/sub-types',
115
+                                                                'related' => '/events/' . $event->getId() . '/sub-types/' . $sub_type->getId(),
116 116
                                                     ],
117 117
                                                     'data' => [
118 118
                                                                 'type' => 'sub-types',
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
                                         ],
122 122
                                         'location' => [
123 123
                                                     'links' => [
124
-                                                                'self'    => '/events/'.$event->getId().'/relationships/locations',
125
-                                                                'related' => '/events/'.$event->getId().'/locations/'.$location->getId(),
124
+                                                                'self'    => '/events/' . $event->getId() . '/relationships/locations',
125
+                                                                'related' => '/events/' . $event->getId() . '/locations/' . $location->getId(),
126 126
                                                     ],
127 127
                                                     'data' => [
128 128
                                                                 'type' => 'locations',
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                                           'description' => $series->description,
141 141
                             ],
142 142
                             'links' => [
143
-                                        'self' => '/series/'.$series->getId(),
143
+                                        'self' => '/series/' . $series->getId(),
144 144
                             ],
145 145
                           ],
146 146
                           [
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
                                       'description' => $type->description,
152 152
                             ],
153 153
                             'links' => [
154
-                                        'self' => '/types/'.$type->getId(),
154
+                                        'self' => '/types/' . $type->getId(),
155 155
                             ],
156 156
                           ],
157 157
                           [
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                                       'description' => $sub_type->description,
163 163
                             ],
164 164
                             'links' => [
165
-                                        'self' => '/sub-types/'.$sub_type->getId(),
165
+                                        'self' => '/sub-types/' . $sub_type->getId(),
166 166
                             ],
167 167
                           ],
168 168
                           [
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
                                       'name' => $location->name,
173 173
                             ],
174 174
                             'links' => [
175
-                                        'self' => '/locations/'.$location->getId(),
175
+                                        'self' => '/locations/' . $location->getId(),
176 176
                             ],
177 177
                           ],
178 178
           ],
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 
187 187
 // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~
188 188
 
189
-$app->post('/series', function ($request, $response, $args) {
189
+$app->post('/series', function($request, $response, $args) {
190 190
     $postData = $request->getParsedBody();
191 191
 
192 192
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
     return $response->withJson($data);
210 210
 });
211 211
 
212
-$app->get('/series/{id}', function ($request, $response, $args) {
212
+$app->get('/series/{id}', function($request, $response, $args) {
213 213
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
214 214
 
215 215
     $series = new Series();
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     return $response->withJson($data);
227 227
 });
228 228
 
229
-$app->delete('/series/{id}', function ($request, $response, $args) {
229
+$app->delete('/series/{id}', function($request, $response, $args) {
230 230
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
231 231
 
232 232
     $series = new Series();
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 
245 245
 // ~~~~~~~~~~~~~~~ Type ~~~~~~~~~~~~~~~
246 246
 
247
-$app->post('/types', function ($request, $response, $args) {
247
+$app->post('/types', function($request, $response, $args) {
248 248
     $postData = $request->getParsedBody();
249 249
 
250 250
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
     return $response->withJson($data);
268 268
 });
269 269
 
270
-$app->get('/types/{id}', function ($request, $response, $args) {
270
+$app->get('/types/{id}', function($request, $response, $args) {
271 271
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
272 272
 
273 273
     $type = new Type();
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
     return $response->withJson($data);
285 285
 });
286 286
 
287
-$app->delete('/types/{id}', function ($request, $response, $args) {
287
+$app->delete('/types/{id}', function($request, $response, $args) {
288 288
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
289 289
 
290 290
     $type = new Type();
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
 // ~~~~~~~~~~~~~~~ Sub Type ~~~~~~~~~~~~~~~
304 304
 
305
-$app->post('/sub-types', function ($request, $response, $args) {
305
+$app->post('/sub-types', function($request, $response, $args) {
306 306
     $postData = $request->getParsedBody();
307 307
 
308 308
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
     return $response->withJson($data);
326 326
 });
327 327
 
328
-$app->get('/sub-types/{id}', function ($request, $response, $args) {
328
+$app->get('/sub-types/{id}', function($request, $response, $args) {
329 329
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
330 330
 
331 331
     $type = new SubType();
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
     return $response->withJson($data);
343 343
 });
344 344
 
345
-$app->delete('/sub-types/{id}', function ($request, $response, $args) {
345
+$app->delete('/sub-types/{id}', function($request, $response, $args) {
346 346
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
347 347
 
348 348
     $type = new SubType();
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 
361 361
 // ~~~~~~~~~~~~~~~ Location ~~~~~~~~~~~~~~~
362 362
 
363
-$app->post('/locations', function ($request, $response, $args) {
363
+$app->post('/locations', function($request, $response, $args) {
364 364
     $postData = $request->getParsedBody();
365 365
 
366 366
     $name = filter_var($postData['name'], FILTER_SANITIZE_STRING);
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
     return $response->withJson($data);
381 381
 });
382 382
 
383
-$app->get('/locations/{id}', function ($request, $response, $args) {
383
+$app->get('/locations/{id}', function($request, $response, $args) {
384 384
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
385 385
 
386 386
     $location = new Location();
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
     return $response->withJson($data);
397 397
 });
398 398
 
399
-$app->delete('/locations/{id}', function ($request, $response, $args) {
399
+$app->delete('/locations/{id}', function($request, $response, $args) {
400 400
     $id = (int) filter_var($args['id'], FILTER_SANITIZE_NUMBER_INT);
401 401
 
402 402
     $location = new Location();
Please login to merge, or discard this patch.
public/plugins/datatables/extensions/Scroller/examples/data/ssp.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 // parameter represents the DataTables column identifier. In this case simple
30 30
 // indexes
31 31
 $columns = [
32
-    ['db' => 'id',         'dt' => 0],
33
-    ['db' => 'firstname',  'dt' => 1],
34
-    ['db' => 'surname',    'dt' => 2],
35
-    ['db' => 'zip',        'dt' => 3],
36
-    ['db' => 'country',    'dt' => 4],
32
+    ['db' => 'id', 'dt' => 0],
33
+    ['db' => 'firstname', 'dt' => 1],
34
+    ['db' => 'surname', 'dt' => 2],
35
+    ['db' => 'zip', 'dt' => 3],
36
+    ['db' => 'country', 'dt' => 4],
37 37
 ];
38 38
 
39 39
 // SQL server connection information
Please login to merge, or discard this patch.
public/old/swaps.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 // ensure user is allowed to see page
40 40
 
41 41
 if (!isAdmin() && $queryStringUser != $sessionUserId) {
42
-    header('Location: swaps.php?user='.$sessionUserId);
42
+    header('Location: swaps.php?user=' . $sessionUserId);
43 43
 }
44 44
 
45 45
 // fetch swaps
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
               <p>
91 91
                 <strong>
92 92
                   <s class="text-red">
93
-                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
93
+                    <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
94 94
                   </s>
95 95
                   &#8594;
96 96
                   <span class="text-green">
97
-                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
97
+                    <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
98 98
                   </span>
99 99
                 </strong>
100 100
               </p>
Please login to merge, or discard this patch.
public/old/overview.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     exit;
34 34
 }
35 35
 if (!isAdmin()) {
36
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
36
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
37 37
     exit;
38 38
 }
39 39
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 
116 116
 		  <?php
117 117
             else:
118
-                echo '<div class="box-body">'.$sentSuccess.'</div>';
118
+                echo '<div class="box-body">' . $sentSuccess . '</div>';
119 119
             endif;
120 120
             ?>
121 121
 				</div>
Please login to merge, or discard this patch.
public/old/editBand.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     exit;
34 34
 }
35 35
 if (!isAdmin()) {
36
-    header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME']));
36
+    header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME']));
37 37
     exit;
38 38
 }
39 39
 
@@ -119,15 +119,15 @@  discard block
 block discarded – undo
119 119
                 }
120 120
 
121 121
                 if ($viewPeople['skill'] != '') {
122
-                    $skill = ' - <em>'.$viewPeople['skill'].'</em>';
122
+                    $skill = ' - <em>' . $viewPeople['skill'] . '</em>';
123 123
                 } else {
124 124
                     $skill = '';
125 125
                 }
126 126
                 if ($position == 2) {
127
-                    echo "<div class='checkboxitem right'><label class='styled' for='rehearsaldate[".$viewPeople['skillID']."]'>".
128
-                        $viewPeople['name'].$skill."</em></label><input class='styled' ".$checked."type='checkbox' id='rehearsaldate[".
129
-                        $viewPeople['skillID']."]'	name='rehearsaldate[]' value='".
130
-                        $viewPeople['skillID']."' /></div></div>";
127
+                    echo "<div class='checkboxitem right'><label class='styled' for='rehearsaldate[" . $viewPeople['skillID'] . "]'>" .
128
+                        $viewPeople['name'] . $skill . "</em></label><input class='styled' " . $checked . "type='checkbox' id='rehearsaldate[" .
129
+                        $viewPeople['skillID'] . "]'	name='rehearsaldate[]' value='" .
130
+                        $viewPeople['skillID'] . "' /></div></div>";
131 131
 
132 132
                     $position = 1;
133 133
                 } else {
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
                         $i = '1';
140 140
                     }
141 141
 
142
-                    echo "<div class='row".$class."'>
143
-						<div class='checkboxitem'><label class='styled' for='rehearsaldate[".$viewPeople['skillID']."]'>".
144
-                        $viewPeople['name'].$skill."</em></label><input class='styled' ".$checked."type='checkbox' id='rehearsaldate[".
145
-                        $viewPeople['skillID']."]'	name='rehearsaldate[]' value='".
146
-                        $viewPeople['skillID']."' /></div>";
142
+                    echo "<div class='row" . $class . "'>
143
+						<div class='checkboxitem'><label class='styled' for='rehearsaldate[".$viewPeople['skillID'] . "]'>" .
144
+                        $viewPeople['name'] . $skill . "</em></label><input class='styled' " . $checked . "type='checkbox' id='rehearsaldate[" .
145
+                        $viewPeople['skillID'] . "]'	name='rehearsaldate[]' value='" .
146
+                        $viewPeople['skillID'] . "' /></div>";
147 147
 
148 148
                     $position = 2;
149 149
                 }
Please login to merge, or discard this patch.
public/old/plugins/datatables/extensions/Scroller/examples/data/ssp.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 // parameter represents the DataTables column identifier. In this case simple
30 30
 // indexes
31 31
 $columns = [
32
-    ['db' => 'id',         'dt' => 0],
33
-    ['db' => 'firstname',  'dt' => 1],
34
-    ['db' => 'surname',    'dt' => 2],
35
-    ['db' => 'zip',        'dt' => 3],
36
-    ['db' => 'country',    'dt' => 4],
32
+    ['db' => 'id', 'dt' => 0],
33
+    ['db' => 'firstname', 'dt' => 1],
34
+    ['db' => 'surname', 'dt' => 2],
35
+    ['db' => 'zip', 'dt' => 3],
36
+    ['db' => 'country', 'dt' => 4],
37 37
 ];
38 38
 
39 39
 // SQL server connection information
Please login to merge, or discard this patch.
public/old/swap.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 if (!empty($eventId)) {
111 111
     // ensure user is logged in before allowing creation of swap
112 112
   if (!(isset($_SESSION['is_logged_in']) || $_SESSION['db_is_logged_in'] == true)) {
113
-      $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl().'/swap.php?event='.$eventId;
113
+      $_SESSION['redirectUrl'] = siteSettings()->getSiteUrl() . '/swap.php?event=' . $eventId;
114 114
       header('Location: login.php');
115 115
   }
116 116
     $createSwap = true;
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
             <p>
187 187
               <strong>
188 188
                 <s class="text-red">
189
-                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName().' '.$swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
189
+                  <?php echo $swap->getOldUserRole()->getUser()->getFirstName() . ' ' . $swap->getOldUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getOldUserRole()->getRole()->getName() ?>)
190 190
                 </s>
191 191
                 &#8594;
192 192
                 <span class="text-green">
193
-                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName().' '.$swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
193
+                  <?php echo $swap->getNewUserRole()->getUser()->getFirstName() . ' ' . $swap->getNewUserRole()->getUser()->getLastName() ?> (<?php echo $swap->getNewUserRole()->getRole()->getName() ?>)
194 194
                 </span>
195 195
               </strong>
196 196
             </p>
@@ -225,16 +225,16 @@  discard block
 block discarded – undo
225 225
                 <select name="newUserRole" class="form-control">
226 226
                   <?php
227 227
                   if (roleCanSwapToOtherRoleInGroup($role->roleId)) {
228
-                      $whereAnd = 'r.groupId = '.groupIdWithRole($role->roleId).' AND r.allowRoleSwaps IS NOT FALSE';
228
+                      $whereAnd = 'r.groupId = ' . groupIdWithRole($role->roleId) . ' AND r.allowRoleSwaps IS NOT FALSE';
229 229
                   } else {
230
-                      $whereAnd = 'r.id = '.$role->roleId;
230
+                      $whereAnd = 'r.id = ' . $role->roleId;
231 231
                   }
232
-                  $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';
232
+                  $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';
233 233
                   $result = mysqli_query(db(), $sql) or die(mysqli_error(db()));
234 234
 
235 235
                   while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
236 236
                       ?>
237
-                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'].' '.$row['lastName'].' ('.$row['name'].')'; ?></option>
237
+                    <option value='<?php echo $row['id']; ?>'><?php echo $row['firstName'] . ' ' . $row['lastName'] . ' (' . $row['name'] . ')'; ?></option>
238 238
                   <?php
239 239
                   } ?>
240 240
                 </select>
Please login to merge, or discard this patch.
public/old/createEvents.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
                                         while ($ob = mysqli_fetch_object($result)) {
89 89
                                             if (!(isset($type) && $ob->id == $type)) {
90 90
                                                 $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime));
91
-                                                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>';
91
+                                                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>';
92 92
                                             }
93 93
                                         } ?>
94 94
 									</select>
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
115 115
                                             if (isset($subtype) && $row['id'] == $subtype) {
116 116
                                             } else {
117
-                                                echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
117
+                                                echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
118 118
                                             }
119 119
                                         } ?>
120 120
 									</select>
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
                                         while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
143 143
                                             if (isset($location) && $row['id'] == $location) {
144 144
                                             } else {
145
-                                                echo "<option value='".$row['id']."'>".$row['name'].'</option>';
145
+                                                echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>';
146 146
                                             }
147 147
                                         } ?>
148 148
 									</select>
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
                                     while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
286 286
                                         if (isset($type) && $row['id'] == $type) {
287 287
                                         } else {
288
-                                            echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>';
288
+                                            echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>';
289 289
                                         }
290 290
                                     } ?>
291 291
 								</select>
Please login to merge, or discard this patch.