BitPrepared /
d1b0
@@ -53,15 +53,14 @@ discard block |
||
| 53 | 53 | "clientId"=>$user->id |
| 54 | 54 | ]; |
| 55 | 55 | $response = JsonResponse::create($res, 200, $headers)->setSharedMaxAge(300); |
| 56 | - }else { |
|
| 56 | + } else { |
|
| 57 | 57 | $headers = []; |
| 58 | 58 | $res = [ |
| 59 | 59 | "errore"=>"sbagliato password o user" //TODO roba |
| 60 | 60 | ]; |
| 61 | 61 | $response = JsonResponse::create($res, 401, $headers)->setSharedMaxAge(300); |
| 62 | 62 | } |
| 63 | - } |
|
| 64 | - else { |
|
| 63 | + } else { |
|
| 65 | 64 | //Facebook Redirect |
| 66 | 65 | } |
| 67 | 66 | return $response; // JsonResponse::create($output, 200, $headers)->setSharedMaxAge(300); |
@@ -82,14 +81,14 @@ discard block |
||
| 82 | 81 | if (!$bean->id) { |
| 83 | 82 | //TODO mettere un controllo agli IP che forzano le richieste di token falsi |
| 84 | 83 | $response = "<html><head></head><body>Token non esistente!</body></html>"; |
| 85 | - }else { |
|
| 84 | + } else { |
|
| 86 | 85 | if (strtotime($verify->inserttime) < strtotime("-15 minutes")) { |
| 87 | 86 | $user = R::load('user', $verify->user); |
| 88 | 87 | $user->status = "enabled"; |
| 89 | 88 | $user->updatetime = date('Y-m-d H:i:s'); |
| 90 | 89 | $id = R::store($user); |
| 91 | 90 | $response = "<html><head></head><body>Account attivato complimenti!</body></html>"; |
| 92 | - }else { |
|
| 91 | + } else { |
|
| 93 | 92 | $response = "<html><head></head><body>Impossibile attivare account inserire mail e password per richiedere un nuovo token!</body></html>"; |
| 94 | 93 | } |
| 95 | 94 | } |
@@ -106,11 +106,11 @@ |
||
| 106 | 106 | $user->updatetime = date('Y-m-d G:i:s'); |
| 107 | 107 | $id = R::store($user); |
| 108 | 108 | $res = (object)["id" => $id]; |
| 109 | - }catch (Exception $e) { |
|
| 109 | + } catch (Exception $e) { |
|
| 110 | 110 | echo $e; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - }else { |
|
| 113 | + } else { |
|
| 114 | 114 | |
| 115 | 115 | } |
| 116 | 116 | |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $headers = []; |
| 217 | 217 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
| 218 | 218 | |
| 219 | - }else{ |
|
| 219 | + } else{ |
|
| 220 | 220 | $headers = []; |
| 221 | 221 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
| 222 | 222 | } |
@@ -339,8 +339,10 @@ discard block |
||
| 339 | 339 | $resource->totalpoint = 0; |
| 340 | 340 | $resource_id = R::store($resource); |
| 341 | 341 | $rem_id=getPositionInArray($delete_res,$resource_id); |
| 342 | - if($rem_id != 0) |
|
| 343 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 342 | + if($rem_id != 0) { |
|
| 343 | + array_splice($delete_res,$rem_id,1); |
|
| 344 | + } |
|
| 345 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 344 | 346 | } |
| 345 | 347 | |
| 346 | 348 | foreach($delete_res as $d){ |
@@ -358,8 +360,10 @@ discard block |
||
| 358 | 360 | $pb->part = $part_id; |
| 359 | 361 | $tmp = R::store($pb); |
| 360 | 362 | $rem_id=getPositionInArray($delete_badge,$tmp); |
| 361 | - if($rem_id != 0) |
|
| 362 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 363 | + if($rem_id != 0) { |
|
| 364 | + array_splice($delete_badge,$rem_id,1); |
|
| 365 | + } |
|
| 366 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 363 | 367 | } |
| 364 | 368 | |
| 365 | 369 | foreach($delete_badge as $d){ |
@@ -380,7 +384,7 @@ discard block |
||
| 380 | 384 | if($b->completed === True){ |
| 381 | 385 | echo "CASO 1;<BR />"; |
| 382 | 386 | return $this->$POINT_FOR_USING_A_CONQUERED_BADGE; |
| 383 | - }else{ |
|
| 387 | + } else{ |
|
| 384 | 388 | echo "CASO 2;<BR />"; |
| 385 | 389 | return $this->POINT_FOR_USING_A_BADGE; |
| 386 | 390 | } |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - public function putWorkspace($id,Request $request) |
|
| 134 | + public function putWorkspace($id, Request $request) |
|
| 135 | 135 | { |
| 136 | 136 | $user_id = $this->getSessionId(); |
| 137 | 137 | $data = json_decode($request->getContent(), true); |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $unit = $data['team']['unit']; |
| 146 | 146 | $group = $data['team']['group']; |
| 147 | 147 | |
| 148 | - $wp = R::load("workspace",$id); |
|
| 148 | + $wp = R::load("workspace", $id); |
|
| 149 | 149 | $ws->title = $title; |
| 150 | 150 | $ws->description = $description; |
| 151 | 151 | $ws->environment = $environment; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | $id = R::store($ws); |
| 155 | 155 | |
| 156 | 156 | //save the team |
| 157 | - $team = R::findOne("team","workspace = ?",[$id]); |
|
| 157 | + $team = R::findOne("team", "workspace = ?", [$id]); |
|
| 158 | 158 | $team->patrol = $patrol; |
| 159 | 159 | $team->unit = $unit; |
| 160 | 160 | $team->group = $group; |
@@ -201,12 +201,12 @@ discard block |
||
| 201 | 201 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - public function deleteWorkspace($id,Request $request) |
|
| 204 | + public function deleteWorkspace($id, Request $request) |
|
| 205 | 205 | { |
| 206 | 206 | //Disassocia un utente da un workspace |
| 207 | 207 | $user_id = $this->getSessionId(); |
| 208 | 208 | |
| 209 | - $wp = R::findOne("userworkspace",["workspace = ?"],[$id]); |
|
| 209 | + $wp = R::findOne("userworkspace", ["workspace = ?"], [$id]); |
|
| 210 | 210 | R::trash($ws); |
| 211 | 211 | |
| 212 | 212 | $response = new Response(); |
@@ -251,16 +251,16 @@ discard block |
||
| 251 | 251 | |
| 252 | 252 | $key = $data['key']; |
| 253 | 253 | |
| 254 | - $share = R::findOne("share","key = ?",[$key]); |
|
| 254 | + $share = R::findOne("share", "key = ?", [$key]); |
|
| 255 | 255 | echo $share->inserttime; |
| 256 | - if($share !== NULL){ |
|
| 256 | + if ($share !== NULL) { |
|
| 257 | 257 | $date = new \DateTime(); |
| 258 | 258 | date_sub($date, date_interval_create_from_date_string('15 minutes')); |
| 259 | 259 | |
| 260 | - $wp_id=$share['workspace']; |
|
| 260 | + $wp_id = $share['workspace']; |
|
| 261 | 261 | |
| 262 | 262 | $dateOld = new \DateTime($share->inserttime); |
| 263 | - if($dateOld > $date){ |
|
| 263 | + if ($dateOld > $date) { |
|
| 264 | 264 | $usw = R::dispense("userworkspace"); |
| 265 | 265 | $usw->user = $user_id; |
| 266 | 266 | $usw->workspace = $wp_id; |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | $headers = []; |
| 270 | 270 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
| 271 | 271 | |
| 272 | - }else{ |
|
| 272 | + }else { |
|
| 273 | 273 | $headers = []; |
| 274 | 274 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
| 275 | 275 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | $part->totalpoint = 0; |
| 292 | 292 | $part_id = R::store($part); |
| 293 | 293 | |
| 294 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
| 294 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
| 295 | 295 | $resource = R::dispense("resource"); |
| 296 | 296 | $resource->part = $part_id; |
| 297 | 297 | $resource->inserttime = date('Y-m-d H:i:s'); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | $resource_id = R::store($resource); |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | - foreach($data['badges'] as $badge_id){ //TODO va fixato nelle api |
|
| 306 | + foreach ($data['badges'] as $badge_id) { //TODO va fixato nelle api |
|
| 307 | 307 | $pb = R::dispense("partbadge"); |
| 308 | 308 | $pb->badge = $badge_id; |
| 309 | 309 | $pb->part = $part_id; |
@@ -316,20 +316,20 @@ discard block |
||
| 316 | 316 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | - public function getPart($id,$part_id, Request $request) { |
|
| 319 | + public function getPart($id, $part_id, Request $request) { |
|
| 320 | 320 | $user_id = $this->getSessionId(); |
| 321 | 321 | |
| 322 | 322 | $data = json_decode($request->getContent(), true); |
| 323 | 323 | |
| 324 | - $part = R::findOne("part","id = ?",[$part_id]); |
|
| 324 | + $part = R::findOne("part", "id = ?", [$part_id]); |
|
| 325 | 325 | |
| 326 | - $resource = R::findAll("resource","part = ?",[$part_id]); |
|
| 326 | + $resource = R::findAll("resource", "part = ?", [$part_id]); |
|
| 327 | 327 | |
| 328 | - $partecipants = R::findAll("cero","part = ?",[$part_id]); |
|
| 328 | + $partecipants = R::findAll("cero", "part = ?", [$part_id]); |
|
| 329 | 329 | |
| 330 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
| 330 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
| 331 | 331 | |
| 332 | - $res= [ |
|
| 332 | + $res = [ |
|
| 333 | 333 | "id"=>$part->id, |
| 334 | 334 | "creation"=>$part->inserttime, |
| 335 | 335 | "points"=>$part->points, |
@@ -339,28 +339,28 @@ discard block |
||
| 339 | 339 | "partecipants"=>[] |
| 340 | 340 | ]; |
| 341 | 341 | |
| 342 | - foreach($badges as $b){ |
|
| 343 | - array_push($res['badges'],$b->id); |
|
| 342 | + foreach ($badges as $b) { |
|
| 343 | + array_push($res['badges'], $b->id); |
|
| 344 | 344 | } |
| 345 | - foreach($resource as $r){ |
|
| 346 | - array_push($res['part'],[ |
|
| 345 | + foreach ($resource as $r) { |
|
| 346 | + array_push($res['part'], [ |
|
| 347 | 347 | "type"=>$r->type, |
| 348 | 348 | "hash"=>$r->hash, |
| 349 | 349 | "ref"=>$r->ref |
| 350 | 350 | ]); |
| 351 | 351 | } |
| 352 | - foreach($partecipants as $p){ |
|
| 353 | - array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
| 352 | + foreach ($partecipants as $p) { |
|
| 353 | + array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | $headers = []; |
| 357 | 357 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - private function getPositionInArray($array,$id){ |
|
| 361 | - $count =0; |
|
| 362 | - foreach($array as $a){ |
|
| 363 | - if($a->id === $id){ |
|
| 360 | + private function getPositionInArray($array, $id) { |
|
| 361 | + $count = 0; |
|
| 362 | + foreach ($array as $a) { |
|
| 363 | + if ($a->id === $id) { |
|
| 364 | 364 | return $count; |
| 365 | 365 | } |
| 366 | 366 | $count = $count + 1; |
@@ -368,22 +368,22 @@ discard block |
||
| 368 | 368 | return -1; |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | - public function putPart($id,$part_id, Request $request) { |
|
| 371 | + public function putPart($id, $part_id, Request $request) { |
|
| 372 | 372 | $user_id = $this->getSessionId(); |
| 373 | 373 | |
| 374 | 374 | $data = json_decode($request->getContent(), true); |
| 375 | 375 | |
| 376 | - $part = R::load("part",$part_id); |
|
| 376 | + $part = R::load("part", $part_id); |
|
| 377 | 377 | $part->workspace = $id; |
| 378 | 378 | $part->user = $user_id; |
| 379 | 379 | $part->lastupdatetime = date('Y-m-d H:i:s'); |
| 380 | 380 | $part->totalpoint = 0; |
| 381 | 381 | $part_id = R::store($part); |
| 382 | 382 | |
| 383 | - $delete_res=R::findAll("resource","WHERE part = ?",[$part_id]); |
|
| 383 | + $delete_res = R::findAll("resource", "WHERE part = ?", [$part_id]); |
|
| 384 | 384 | |
| 385 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
| 386 | - $resource = R::findOne("resource","WHERE hash = ? AND deleted = 0",[$r->hash]);//TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
| 385 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
| 386 | + $resource = R::findOne("resource", "WHERE hash = ? AND deleted = 0", [$r->hash]); //TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
| 387 | 387 | $resource->part = $part_id; |
| 388 | 388 | $resource->updatetime = date('Y-m-d H:i:s'); |
| 389 | 389 | $resource->type = $r->type; |
@@ -391,34 +391,34 @@ discard block |
||
| 391 | 391 | $resource->hash = $r->hash; |
| 392 | 392 | $resource->totalpoint = 0; |
| 393 | 393 | $resource_id = R::store($resource); |
| 394 | - $rem_id=getPositionInArray($delete_res,$resource_id); |
|
| 395 | - if($rem_id != 0) |
|
| 396 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 394 | + $rem_id = getPositionInArray($delete_res, $resource_id); |
|
| 395 | + if ($rem_id != 0) |
|
| 396 | + array_splice($delete_res, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 397 | 397 | } |
| 398 | 398 | |
| 399 | - foreach($delete_res as $d){ |
|
| 399 | + foreach ($delete_res as $d) { |
|
| 400 | 400 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
| 401 | - $resource = R::load("resource",[$d->id]); |
|
| 402 | - $resource->deleted=true; |
|
| 401 | + $resource = R::load("resource", [$d->id]); |
|
| 402 | + $resource->deleted = true; |
|
| 403 | 403 | R::store($resource); |
| 404 | 404 | } |
| 405 | 405 | |
| 406 | - $delete_badge=R::findAll("partbadge","WHERE part = ? AND deleted = 0",[$part_id]); |
|
| 406 | + $delete_badge = R::findAll("partbadge", "WHERE part = ? AND deleted = 0", [$part_id]); |
|
| 407 | 407 | |
| 408 | - foreach($data['badges'] as $badge_id){ |
|
| 409 | - $pb = R::load("partbadge",$badge_id); |
|
| 408 | + foreach ($data['badges'] as $badge_id) { |
|
| 409 | + $pb = R::load("partbadge", $badge_id); |
|
| 410 | 410 | $pb->badge = $badge_id; |
| 411 | 411 | $pb->part = $part_id; |
| 412 | 412 | $tmp = R::store($pb); |
| 413 | - $rem_id=getPositionInArray($delete_badge,$tmp); |
|
| 414 | - if($rem_id != 0) |
|
| 415 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 413 | + $rem_id = getPositionInArray($delete_badge, $tmp); |
|
| 414 | + if ($rem_id != 0) |
|
| 415 | + array_splice($delete_badge, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | - foreach($delete_badge as $d){ |
|
| 418 | + foreach ($delete_badge as $d) { |
|
| 419 | 419 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
| 420 | - $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO |
|
| 421 | - $badge->deleted=true; |
|
| 420 | + $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO |
|
| 421 | + $badge->deleted = true; |
|
| 422 | 422 | R::store($badge); |
| 423 | 423 | } |
| 424 | 424 | |
@@ -427,17 +427,17 @@ discard block |
||
| 427 | 427 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 428 | 428 | } |
| 429 | 429 | |
| 430 | - public function deletePart($id,$part_id, Request $request) { |
|
| 430 | + public function deletePart($id, $part_id, Request $request) { |
|
| 431 | 431 | $user_id = $this->getSessionId(); |
| 432 | - $part = R::load("part",$part_id); |
|
| 433 | - $part->deleted=true; |
|
| 432 | + $part = R::load("part", $part_id); |
|
| 433 | + $part->deleted = true; |
|
| 434 | 434 | R::store($part); |
| 435 | 435 | |
| 436 | 436 | |
| 437 | - $delete_badge=R::findAll("partbadge","WHERE part = ?",[$part_id]); |
|
| 438 | - foreach($delete_badge as $d){ |
|
| 439 | - $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
| 440 | - $badge->deleted=true; |
|
| 437 | + $delete_badge = R::findAll("partbadge", "WHERE part = ?", [$part_id]); |
|
| 438 | + foreach ($delete_badge as $d) { |
|
| 439 | + $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
| 440 | + $badge->deleted = true; |
|
| 441 | 441 | R::store($badge); |
| 442 | 442 | } |
| 443 | 443 | |
@@ -449,13 +449,13 @@ discard block |
||
| 449 | 449 | $response->setSharedMaxAge(300); |
| 450 | 450 | } |
| 451 | 451 | |
| 452 | - private function getPoint($badge_id,$badges){ |
|
| 453 | - foreach($badges as $b){ |
|
| 454 | - if($b->id === $badge_id){ |
|
| 455 | - if($b->completed === True){ |
|
| 452 | + private function getPoint($badge_id, $badges) { |
|
| 453 | + foreach ($badges as $b) { |
|
| 454 | + if ($b->id === $badge_id) { |
|
| 455 | + if ($b->completed === True) { |
|
| 456 | 456 | echo "CASO 1;<BR />"; |
| 457 | 457 | return $this->$POINT_FOR_USING_A_CONQUERED_BADGE; |
| 458 | - }else{ |
|
| 458 | + }else { |
|
| 459 | 459 | echo "CASO 2;<BR />"; |
| 460 | 460 | return $this->POINT_FOR_USING_A_BADGE; |
| 461 | 461 | } |
@@ -464,16 +464,16 @@ discard block |
||
| 464 | 464 | echo "CASO 3;<BR />"; |
| 465 | 465 | return $this->POINT_DEFAULT; |
| 466 | 466 | } |
| 467 | - public function checkin($id,$part_id, Request $request) { |
|
| 467 | + public function checkin($id, $part_id, Request $request) { |
|
| 468 | 468 | $user_id = $this->getSessionId(); |
| 469 | 469 | |
| 470 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
| 471 | - $u_badges = R::findAll("userbadge","user = ? AND deleted = 0",[$user_id]); |
|
| 470 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
| 471 | + $u_badges = R::findAll("userbadge", "user = ? AND deleted = 0", [$user_id]); |
|
| 472 | 472 | |
| 473 | 473 | $point_earned = 0; |
| 474 | - foreach($badges as $b){ //SE CI SONO DEI BADGE |
|
| 475 | - $point = $this->getPoint($b->id,$u_badges); |
|
| 476 | - if($point != $this->POINT_DEFAULT){ //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
| 474 | + foreach ($badges as $b) { //SE CI SONO DEI BADGE |
|
| 475 | + $point = $this->getPoint($b->id, $u_badges); |
|
| 476 | + if ($point != $this->POINT_DEFAULT) { //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
| 477 | 477 | echo "PUNTI:".$point; |
| 478 | 478 | $point_earned = $point_earned + $point; |
| 479 | 479 | $pb = R::dispense("cero"); |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | $pb->points = $point; |
| 485 | 485 | $tmp = R::store($pb); |
| 486 | 486 | |
| 487 | - if($point === $this->POINT_FOR_USING_A_BADGE){ //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
| 487 | + if ($point === $this->POINT_FOR_USING_A_BADGE) { //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
| 488 | 488 | $ubc = R::dispense("userbadgeclove"); |
| 489 | 489 | $ubc->user = $user_id; |
| 490 | 490 | $ubc->badge = $b->id; |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | } |
| 496 | 496 | } |
| 497 | 497 | |
| 498 | - if($point_earned <= 0){ //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
| 498 | + if ($point_earned <= 0) { //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
| 499 | 499 | $pb = R::dispense("cero"); |
| 500 | 500 | $pb->user = $user_id; |
| 501 | 501 | $pb->part = $part_id; |
@@ -509,13 +509,13 @@ discard block |
||
| 509 | 509 | |
| 510 | 510 | } |
| 511 | 511 | |
| 512 | - public function deleteCheckin($id,$part_id, Request $request) { |
|
| 512 | + public function deleteCheckin($id, $part_id, Request $request) { |
|
| 513 | 513 | $user_id = $this->getSessionId(); |
| 514 | 514 | |
| 515 | - $u_badges = R::findAll("userbadge","user = ? AND part = ?",[$user_id,$part_id]); |
|
| 515 | + $u_badges = R::findAll("userbadge", "user = ? AND part = ?", [$user_id, $part_id]); |
|
| 516 | 516 | R::trashAll($u_badges); |
| 517 | 517 | |
| 518 | - $cero = R::findAll("cero","user = ? AND part = ?",[$user_id,$part_id]); |
|
| 518 | + $cero = R::findAll("cero", "user = ? AND part = ?", [$user_id, $part_id]); |
|
| 519 | 519 | R::trashAll($cero); |
| 520 | 520 | |
| 521 | 521 | $response = new Response(); |
@@ -28,11 +28,11 @@ |
||
| 28 | 28 | $filter = $request->get('filterBy'); |
| 29 | 29 | echo $filter; |
| 30 | 30 | |
| 31 | - $badge = R::findAll("badge","type = ? AND enable = 1",[$filter]); |
|
| 31 | + $badge = R::findAll("badge", "type = ? AND enable = 1", [$filter]); |
|
| 32 | 32 | |
| 33 | 33 | $res = []; |
| 34 | - foreach($badge as $b){ |
|
| 35 | - array_push($res,[ |
|
| 34 | + foreach ($badge as $b) { |
|
| 35 | + array_push($res, [ |
|
| 36 | 36 | "id"=>$b->id, |
| 37 | 37 | "name"=>$b->name, |
| 38 | 38 | "descritpion"=>$b->description, |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Tests; |
| 4 | 4 | |
| 5 | 5 | use Silex\WebTestCase; |
| 6 | -use JsonSchema\Validator; |
|
| 7 | 6 | |
| 8 | 7 | class WorkspaceTest extends WebTestCase |
| 9 | 8 | { |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | { |
| 10 | 10 | use AbstractAppTest; |
| 11 | 11 | |
| 12 | - public function testGetWorkSpace(){ |
|
| 12 | + public function testGetWorkSpace() { |
|
| 13 | 13 | $schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
| 14 | 14 | |
| 15 | 15 | $client = $this->createClient(); |
@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | $crawler = $client->request('GET', '/api/v1/workspace/1'); |
| 19 | 19 | $response = $client->getResponse(); |
| 20 | 20 | $data = $client->getResponse()->getContent(); |
| 21 | - $validator = $this->askValidation($data,$schema); |
|
| 21 | + $validator = $this->askValidation($data, $schema); |
|
| 22 | 22 | |
| 23 | 23 | if ($validator->isValid()) { |
| 24 | 24 | echo "The supplied JSON validates against the schema.\n"; |
| 25 | 25 | $this->assertTrue(true); |
| 26 | - } else { |
|
| 26 | + }else { |
|
| 27 | 27 | echo "JSON does not validate. Violations:\n"; |
| 28 | 28 | foreach ($validator->getErrors() as $error) { |
| 29 | 29 | echo "[{$error['property']}] {$error['message']}\n"; |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Tests; |
| 4 | 4 | |
| 5 | 5 | use Silex\WebTestCase; |
| 6 | -use JsonSchema\Validator; |
|
| 7 | 6 | |
| 8 | 7 | class WorkspaceTest extends WebTestCase |
| 9 | 8 | { |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | { |
| 10 | 10 | use AbstractAppTest; |
| 11 | 11 | |
| 12 | - public function testGetWorkspaceList(){ |
|
| 12 | + public function testGetWorkspaceList() { |
|
| 13 | 13 | $schema = __DIR__.'/../../../../api/schemas/workspaceList.json'; |
| 14 | 14 | |
| 15 | 15 | //$client = $this->createClient(); |
@@ -26,8 +26,10 @@ |
||
| 26 | 26 | $app['log.level'] = Monolog\Logger::DEBUG; //ERROR in prod |
| 27 | 27 | $app['api.version'] = "v1"; |
| 28 | 28 | $app['api.endpoint'] = "/api"; |
| 29 | -if (!defined('ROOT_PATH')) |
|
| 30 | - define('ROOT_PATH', __DIR__); //solo in dev va bene |
|
| 29 | +if (!defined('ROOT_PATH')) { |
|
| 30 | + define('ROOT_PATH', __DIR__); |
|
| 31 | +} |
|
| 32 | +//solo in dev va bene |
|
| 31 | 33 | // @remember: https://{enviroment}.{domain}/{contextPath}/api/v1 |
| 32 | 34 | |
| 33 | 35 | // manca il contesto , FIXME: da pensare le ACL di haproxy come saranno da qui si decide come usare come mountpoint |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | public function logIn($client){ |
| 13 | 13 | $client->request('POST', |
| 14 | 14 | '/api/v1/security/login', |
| 15 | - [], |
|
| 15 | + [], |
|
| 16 | 16 | [], |
| 17 | 17 | ['CONTENT_TYPE' => 'application/json'], |
| 18 | 18 | '{"authMode":"Email","email":"[email protected]","name":"ugo","surname":"ugo","password":"cane"}'); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | return $app; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function logIn($client){ |
|
| 23 | + public function logIn($client) { |
|
| 24 | 24 | $client->request('POST', |
| 25 | 25 | '/api/v1/security/login', |
| 26 | 26 | [], |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | return $client; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function askValidation($data,$schema){ |
|
| 33 | + public function askValidation($data, $schema) { |
|
| 34 | 34 | $validator = new \JsonSchema\Validator; |
| 35 | - $js_schema = (object)['$ref' => 'file://' . $schema]; |
|
| 35 | + $js_schema = (object)['$ref' => 'file://'.$schema]; |
|
| 36 | 36 | $validator->check(json_decode($data), $js_schema); |
| 37 | 37 | return $validator; |
| 38 | 38 | } |
