@@ -148,6 +148,12 @@ discard block |
||
| 148 | 148 | return $statement->fetchAll(PDO::FETCH_CLASS, $returnClass); |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | + /** |
|
| 152 | + * @param string $returnClass |
|
| 153 | + * @param string $table |
|
| 154 | + * @param string[] $columns |
|
| 155 | + * @param string[] $where |
|
| 156 | + */ |
|
| 151 | 157 | public function selectSingle($returnClass, $table, $columns, $where = null) |
| 152 | 158 | { |
| 153 | 159 | $statement = $this->selectStatement($table, $columns, $where); |
@@ -215,6 +221,8 @@ discard block |
||
| 215 | 221 | |
| 216 | 222 | /** |
| 217 | 223 | * Use with caution: it is often better to archive items to prevent creating null references. |
| 224 | + * @param string $table |
|
| 225 | + * @param string[] $where |
|
| 218 | 226 | */ |
| 219 | 227 | public function delete($table, $where) |
| 220 | 228 | { |
@@ -253,6 +261,9 @@ discard block |
||
| 253 | 261 | return $table; |
| 254 | 262 | } |
| 255 | 263 | |
| 264 | + /** |
|
| 265 | + * @param string $table |
|
| 266 | + */ |
|
| 256 | 267 | private function tableExists($table) |
| 257 | 268 | { |
| 258 | 269 | // todo: implement table check |
@@ -180,10 +180,10 @@ discard block |
||
| 180 | 180 | if ($first) { |
| 181 | 181 | $first = false; |
| 182 | 182 | $fields .= $item['field']; |
| 183 | - $valuesPlaceholder .= ':'.$item['field']; |
|
| 183 | + $valuesPlaceholder .= ':' . $item['field']; |
|
| 184 | 184 | } else { |
| 185 | - $fields .= ', '.$item['field']; |
|
| 186 | - $valuesPlaceholder .= ', :'.$item['field']; |
|
| 185 | + $fields .= ', ' . $item['field']; |
|
| 186 | + $valuesPlaceholder .= ', :' . $item['field']; |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | if ($item['type'] == 's' || $item['type'] == 'string') { |
@@ -201,9 +201,9 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - $statement = $this->db_connection->prepare('INSERT INTO '.$table.' ('.$fields.') VALUES ('.$valuesPlaceholder.')'); |
|
| 204 | + $statement = $this->db_connection->prepare('INSERT INTO ' . $table . ' (' . $fields . ') VALUES (' . $valuesPlaceholder . ')'); |
|
| 205 | 205 | foreach ($data as $item) { |
| 206 | - $statement->bindParam(':'.$item['field'], $item['value']); |
|
| 206 | + $statement->bindParam(':' . $item['field'], $item['value']); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | if ($statement->execute()) { |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | |
| 249 | 249 | private function addPrefix($table) |
| 250 | 250 | { |
| 251 | - $table = $this->db_prefix.$table; |
|
| 251 | + $table = $this->db_prefix . $table; |
|
| 252 | 252 | |
| 253 | 253 | return $table; |
| 254 | 254 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | public function count($table, $column, $where = null) |
| 273 | 273 | { |
| 274 | 274 | $columns = [ |
| 275 | - 'COUNT('.$column.') AS count', |
|
| 275 | + 'COUNT(' . $column . ') AS count', |
|
| 276 | 276 | ]; |
| 277 | 277 | $statement = $this->selectStatement($table, $columns, $where); |
| 278 | 278 | |
@@ -196,7 +196,7 @@ |
||
| 196 | 196 | /** |
| 197 | 197 | * Determine if the user is marked as available for an event. |
| 198 | 198 | * |
| 199 | - * @return bool if user is available |
|
| 199 | + * @return null|boolean if user is available |
|
| 200 | 200 | */ |
| 201 | 201 | public function isAvailableForEvent(Event $event) |
| 202 | 202 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function getName() |
| 79 | 79 | { |
| 80 | - return $this->firstname.' '.$this->lastname; |
|
| 80 | + return $this->firstname . ' ' . $this->lastname; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
@@ -96,16 +96,16 @@ discard block |
||
| 96 | 96 | if ($socialAuth->getPlatform() == 'facebook') { |
| 97 | 97 | switch ($size) { |
| 98 | 98 | case 'small': // 50px x 50px |
| 99 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=square'; |
|
| 99 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=square'; |
|
| 100 | 100 | break; |
| 101 | 101 | case 'medium': // 200px x 200px |
| 102 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
| 102 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
| 103 | 103 | break; |
| 104 | 104 | case 'large': // 200px x 200px |
| 105 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture?type=large'; |
|
| 105 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture?type=large'; |
|
| 106 | 106 | break; |
| 107 | 107 | default: |
| 108 | - return '//graph.facebook.com/'.$socialAuth->getSocialId().'/picture'; |
|
| 108 | + return '//graph.facebook.com/' . $socialAuth->getSocialId() . '/picture'; |
|
| 109 | 109 | break; |
| 110 | 110 | } |
| 111 | 111 | } elseif ($socialAuth->getPlatform() == 'onebody') { |
@@ -114,16 +114,16 @@ discard block |
||
| 114 | 114 | $extension = pathinfo($socialAuth->getMeta()['photo-file-name'], PATHINFO_EXTENSION); |
| 115 | 115 | switch ($size) { |
| 116 | 116 | case 'small': // 50px x 50px |
| 117 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
| 117 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
| 118 | 118 | break; |
| 119 | 119 | case 'medium': // 150px x 150px |
| 120 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/small/'.$photoFingerprint.'.'.$extension; |
|
| 120 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/small/' . $photoFingerprint . '.' . $extension; |
|
| 121 | 121 | break; |
| 122 | 122 | case 'large': // 500px x 500px |
| 123 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/medium/'.$photoFingerprint.'.'.$extension; |
|
| 123 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/medium/' . $photoFingerprint . '.' . $extension; |
|
| 124 | 124 | break; |
| 125 | 125 | default: |
| 126 | - return $baseUrl.'/system/production/people/photos/'.$socialAuth->getSocialId().'/tn/'.$photoFingerprint.'.'.$extension; |
|
| 126 | + return $baseUrl . '/system/production/people/photos/' . $socialAuth->getSocialId() . '/tn/' . $photoFingerprint . '.' . $extension; |
|
| 127 | 127 | break; |
| 128 | 128 | } |
| 129 | 129 | } |
@@ -132,16 +132,16 @@ discard block |
||
| 132 | 132 | |
| 133 | 133 | switch ($size) { |
| 134 | 134 | case 'small': // 50px x 50px |
| 135 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
| 135 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
| 136 | 136 | break; |
| 137 | 137 | case 'medium': // 200px x 200px |
| 138 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=200&d=mm'; |
|
| 138 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=200&d=mm'; |
|
| 139 | 139 | break; |
| 140 | 140 | case 'large': // 500px x 500px |
| 141 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=500&d=mm'; |
|
| 141 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=500&d=mm'; |
|
| 142 | 142 | break; |
| 143 | 143 | default: |
| 144 | - return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))).'?s=50&d=mm'; |
|
| 144 | + return '//www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))) . '?s=50&d=mm'; |
|
| 145 | 145 | break; |
| 146 | 146 | } |
| 147 | 147 | } |
@@ -119,6 +119,9 @@ |
||
| 119 | 119 | return true; |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | + /** |
|
| 123 | + * @param EmailAddress $username |
|
| 124 | + */ |
|
| 122 | 125 | private function numberOfLoginAttemptsIsOk($username) |
| 123 | 126 | { |
| 124 | 127 | $numberOfAllowedAttempts = 8; |
@@ -23,15 +23,15 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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(); |
@@ -29,11 +29,11 @@ |
||
| 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 |
@@ -39,7 +39,7 @@ discard block |
||
| 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 |
||
| 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 | → |
| 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> |
@@ -33,7 +33,7 @@ discard block |
||
| 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 |
||
| 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> |
@@ -33,7 +33,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -29,11 +29,11 @@ |
||
| 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 |