@@ -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 | |
@@ -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 |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $headers = []; |
| 276 | 276 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
| 277 | 277 | |
| 278 | - }else{ |
|
| 278 | + } else{ |
|
| 279 | 279 | $headers = []; |
| 280 | 280 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
| 281 | 281 | } |
@@ -358,8 +358,9 @@ discard block |
||
| 358 | 358 | } |
| 359 | 359 | foreach($partecipants as $p){ |
| 360 | 360 | array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
| 361 | - if($user_id == $r['id']) |
|
| 362 | - $checked = true; |
|
| 361 | + if($user_id == $r['id']) { |
|
| 362 | + $checked = true; |
|
| 363 | + } |
|
| 363 | 364 | } |
| 364 | 365 | $res['present'] = true; |
| 365 | 366 | |
@@ -402,8 +403,10 @@ discard block |
||
| 402 | 403 | $resource->totalpoint = 0; |
| 403 | 404 | $resource_id = R::store($resource); |
| 404 | 405 | $rem_id=getPositionInArray($delete_res,$resource_id); |
| 405 | - if($rem_id != 0) |
|
| 406 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 406 | + if($rem_id != 0) { |
|
| 407 | + array_splice($delete_res,$rem_id,1); |
|
| 408 | + } |
|
| 409 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 407 | 410 | } |
| 408 | 411 | |
| 409 | 412 | foreach($delete_res as $d){ |
@@ -421,8 +424,10 @@ discard block |
||
| 421 | 424 | $pb->part = $part_id; |
| 422 | 425 | $tmp = R::store($pb); |
| 423 | 426 | $rem_id=getPositionInArray($delete_badge,$tmp); |
| 424 | - if($rem_id != 0) |
|
| 425 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 427 | + if($rem_id != 0) { |
|
| 428 | + array_splice($delete_badge,$rem_id,1); |
|
| 429 | + } |
|
| 430 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 426 | 431 | } |
| 427 | 432 | |
| 428 | 433 | foreach($delete_badge as $d){ |
@@ -465,7 +470,7 @@ discard block |
||
| 465 | 470 | if($b->completed === True){ |
| 466 | 471 | echo "CASO 1;<BR />"; |
| 467 | 472 | return $this->POINT_FOR_USING_A_CONQUERED_BADGE; |
| 468 | - }else{ |
|
| 473 | + } else{ |
|
| 469 | 474 | echo "CASO 2;<BR />"; |
| 470 | 475 | return $this->POINT_FOR_USING_A_BADGE; |
| 471 | 476 | } |