@@ -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 |
@@ -266,10 +266,11 @@ |
||
266 | 266 | private function getPoint($badge_id,$badges){ |
267 | 267 | foreach($badges as $b){ |
268 | 268 | if($b->id === $badge_id){ |
269 | - if($b->completed === True) |
|
270 | - return POINT_FOR_USING_A_CONQUERED_BADGE; |
|
271 | - else |
|
272 | - return POINT_FOR_USING_A_BADGE; |
|
269 | + if($b->completed === True) { |
|
270 | + return POINT_FOR_USING_A_CONQUERED_BADGE; |
|
271 | + } else { |
|
272 | + return POINT_FOR_USING_A_BADGE; |
|
273 | + } |
|
273 | 274 | } |
274 | 275 | } |
275 | 276 | return POINT_DEFAULT; |
@@ -196,8 +196,8 @@ discard block |
||
196 | 196 | $part->totalpoint = 0; |
197 | 197 | $part_id = R::store($part); |
198 | 198 | |
199 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
200 | - if($r->type != "badge"){ |
|
199 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
200 | + if ($r->type != "badge") { |
|
201 | 201 | $resource = R::dispense("resource"); |
202 | 202 | $resource->part = $part_id; |
203 | 203 | $resource->inserttime = date('Y-m-d H:i:s'); |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | } |
211 | 211 | } |
212 | 212 | |
213 | - foreach($data['badges'] as $badge_id){ //TODO va fixato nelle api |
|
213 | + foreach ($data['badges'] as $badge_id) { //TODO va fixato nelle api |
|
214 | 214 | $pb = R::dispense("partbadge"); |
215 | 215 | $pb->badge = $badge_id; |
216 | 216 | $pb->part = $part_id; |
@@ -223,20 +223,20 @@ discard block |
||
223 | 223 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
224 | 224 | } |
225 | 225 | |
226 | - public function getPart($id,$part_id,$request) { |
|
226 | + public function getPart($id, $part_id, $request) { |
|
227 | 227 | $user_id = $this->getSessionId(); |
228 | 228 | |
229 | 229 | $data = json_decode($request->getContent(), true); |
230 | 230 | |
231 | - $part = R::finOne("part","id = ?",[$part_id]); |
|
231 | + $part = R::finOne("part", "id = ?", [$part_id]); |
|
232 | 232 | |
233 | - $resource = R::findAll("resource","part = ?",[$part_id]); |
|
233 | + $resource = R::findAll("resource", "part = ?", [$part_id]); |
|
234 | 234 | |
235 | - $partecipants = R::findAll("cero","part = ?",[$part_id]); |
|
235 | + $partecipants = R::findAll("cero", "part = ?", [$part_id]); |
|
236 | 236 | |
237 | - $badges = R::findAll("partbadge","part = ?",[$part_id]); |
|
237 | + $badges = R::findAll("partbadge", "part = ?", [$part_id]); |
|
238 | 238 | |
239 | - $res= [ |
|
239 | + $res = [ |
|
240 | 240 | "id"=>$part->id, |
241 | 241 | "creation"=>$part->inserttime, |
242 | 242 | "points"=>$part->points, |
@@ -246,27 +246,27 @@ discard block |
||
246 | 246 | "partecipants"=>[] |
247 | 247 | ]; |
248 | 248 | |
249 | - foreach($badges as $b){ |
|
250 | - array_push($res['badges'],$b->id); |
|
249 | + foreach ($badges as $b) { |
|
250 | + array_push($res['badges'], $b->id); |
|
251 | 251 | } |
252 | - foreach($resource as $r){ |
|
253 | - array_push($res['part'],[ |
|
252 | + foreach ($resource as $r) { |
|
253 | + array_push($res['part'], [ |
|
254 | 254 | "type"=>$r->type, |
255 | 255 | "hash"=>$r->hash, |
256 | 256 | "ref"=>$r->ref |
257 | 257 | ]); |
258 | 258 | } |
259 | - foreach($partecipants as $p){ |
|
260 | - array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
259 | + foreach ($partecipants as $p) { |
|
260 | + array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
261 | 261 | } |
262 | 262 | |
263 | 263 | $headers = []; |
264 | 264 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
265 | 265 | } |
266 | - private function getPoint($badge_id,$badges){ |
|
267 | - foreach($badges as $b){ |
|
268 | - if($b->id === $badge_id){ |
|
269 | - if($b->completed === True) |
|
266 | + private function getPoint($badge_id, $badges) { |
|
267 | + foreach ($badges as $b) { |
|
268 | + if ($b->id === $badge_id) { |
|
269 | + if ($b->completed === True) |
|
270 | 270 | return POINT_FOR_USING_A_CONQUERED_BADGE; |
271 | 271 | else |
272 | 272 | return POINT_FOR_USING_A_BADGE; |
@@ -274,14 +274,14 @@ discard block |
||
274 | 274 | } |
275 | 275 | return POINT_DEFAULT; |
276 | 276 | } |
277 | - public function checkin($id,$part_id,$request) { |
|
277 | + public function checkin($id, $part_id, $request) { |
|
278 | 278 | $user_id = $this->getSessionId(); |
279 | 279 | |
280 | - $badges = R::findAll("partbadge","part = ?",[$part_id]); |
|
281 | - $u_badges = R::findAll("userbadge","user = ?",[$user_id]); |
|
280 | + $badges = R::findAll("partbadge", "part = ?", [$part_id]); |
|
281 | + $u_badges = R::findAll("userbadge", "user = ?", [$user_id]); |
|
282 | 282 | |
283 | - foreach($badges as $b){ |
|
284 | - $point = getPoint($b->id,$u_badges); |
|
283 | + foreach ($badges as $b) { |
|
284 | + $point = getPoint($b->id, $u_badges); |
|
285 | 285 | $pb = R::dispense("cero"); |
286 | 286 | $pb->user = $user_id; |
287 | 287 | $pb->part = $part_id; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $bp->points = $point; |
291 | 291 | $tmp = R::store($pb); |
292 | 292 | |
293 | - if($point === POINT_FOR_USING_A_BADGE){ |
|
293 | + if ($point === POINT_FOR_USING_A_BADGE) { |
|
294 | 294 | $ubc = R::dispense("userbadgeclove"); |
295 | 295 | $ubc->user = $user_id; |
296 | 296 | $ubc->badge = $b->id; |