@@ -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(); |
@@ -56,7 +56,7 @@ |
||
56 | 56 | if ($validator->isValid()) { |
57 | 57 | echo "The supplied JSON validates against the schema.\n"; |
58 | 58 | $assert = true; |
59 | - }else { |
|
59 | + } else { |
|
60 | 60 | echo "JSON does not validate. Violations:\n"; |
61 | 61 | foreach ($validator->getErrors() as $error) { |
62 | 62 | echo "[{$error['property']}] {$error['message']}\n"; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | $headers = []; |
278 | 278 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
279 | 279 | |
280 | - } else{ |
|
280 | + }else { |
|
281 | 281 | $headers = []; |
282 | 282 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
283 | 283 | } |
@@ -350,20 +350,20 @@ discard block |
||
350 | 350 | "partecipants"=>[] |
351 | 351 | ]; |
352 | 352 | |
353 | - foreach($badges as $b){ |
|
354 | - array_push($res['badges'],$b->id); |
|
353 | + foreach ($badges as $b) { |
|
354 | + array_push($res['badges'], $b->id); |
|
355 | 355 | } |
356 | - foreach($resource as $r){ |
|
357 | - array_push($res['part'],[ |
|
356 | + foreach ($resource as $r) { |
|
357 | + array_push($res['part'], [ |
|
358 | 358 | "type"=>$r->type, |
359 | 359 | "hash"=>$r->hash, |
360 | 360 | "ref"=>$r->ref |
361 | 361 | ]); |
362 | 362 | |
363 | 363 | } |
364 | - foreach($partecipants as $p){ |
|
365 | - array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
366 | - if($user_id == $r['id']) { |
|
364 | + foreach ($partecipants as $p) { |
|
365 | + array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
366 | + if ($user_id == $r['id']) { |
|
367 | 367 | $checked = true; |
368 | 368 | } |
369 | 369 | } |
@@ -472,13 +472,13 @@ discard block |
||
472 | 472 | $response->setSharedMaxAge(300); |
473 | 473 | } |
474 | 474 | |
475 | - private function getPoint($badge_id,$badges){ |
|
476 | - foreach($badges as $b){ |
|
477 | - if($b->id === $badge_id){ |
|
478 | - if($b->completed === True){ |
|
475 | + private function getPoint($badge_id, $badges) { |
|
476 | + foreach ($badges as $b) { |
|
477 | + if ($b->id === $badge_id) { |
|
478 | + if ($b->completed === True) { |
|
479 | 479 | echo "CASO 1;<BR />"; |
480 | 480 | return $this->POINT_FOR_USING_A_CONQUERED_BADGE; |
481 | - } else{ |
|
481 | + }else { |
|
482 | 482 | echo "CASO 2;<BR />"; |
483 | 483 | return $this->POINT_FOR_USING_A_BADGE; |
484 | 484 | } |
@@ -415,8 +415,10 @@ discard block |
||
415 | 415 | $resource->totalpoint = 0; |
416 | 416 | $resource_id = R::store($resource); |
417 | 417 | $rem_id = $this->getPositionInArray($delete_res, $resource_id); |
418 | - if ($rem_id != 0) |
|
419 | - array_splice($delete_res, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
418 | + if ($rem_id != 0) { |
|
419 | + array_splice($delete_res, $rem_id, 1); |
|
420 | + } |
|
421 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
420 | 422 | } |
421 | 423 | |
422 | 424 | foreach ($delete_res as $d) { |
@@ -434,8 +436,10 @@ discard block |
||
434 | 436 | $pb->part = $part_id; |
435 | 437 | $tmp = R::store($pb); |
436 | 438 | $rem_id = $this->getPositionInArray($delete_badge, $tmp); |
437 | - if ($rem_id != 0) |
|
438 | - array_splice($delete_badge, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
439 | + if ($rem_id != 0) { |
|
440 | + array_splice($delete_badge, $rem_id, 1); |
|
441 | + } |
|
442 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
439 | 443 | } |
440 | 444 | |
441 | 445 | foreach ($delete_badge as $d) { |
@@ -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 |
@@ -53,14 +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 | - } else { |
|
63 | + }else { |
|
64 | 64 | //Facebook Redirect |
65 | 65 | } |
66 | 66 | return $response; // JsonResponse::create($output, 200, $headers)->setSharedMaxAge(300); |
@@ -81,14 +81,14 @@ discard block |
||
81 | 81 | if (!$bean->id) { |
82 | 82 | //TODO mettere un controllo agli IP che forzano le richieste di token falsi |
83 | 83 | $response = "<html><head></head><body>Token non esistente!</body></html>"; |
84 | - } else { |
|
84 | + }else { |
|
85 | 85 | if (strtotime($verify->inserttime) < strtotime("-15 minutes")) { |
86 | 86 | $user = R::load('user', $verify->user); |
87 | 87 | $user->status = "enabled"; |
88 | 88 | $user->updatetime = date('Y-m-d H:i:s'); |
89 | 89 | $id = R::store($user); |
90 | 90 | $response = "<html><head></head><body>Account attivato complimenti!</body></html>"; |
91 | - } else { |
|
91 | + }else { |
|
92 | 92 | $response = "<html><head></head><body>Impossibile attivare account inserire mail e password per richiedere un nuovo token!</body></html>"; |
93 | 93 | } |
94 | 94 | } |