Subversion Repository Public Repository

Nextrek

Diff Revisions 579 vs 614 for /Android/SmartCharging/endPoints/registrazione_locale.php

Diff revisions: vs.
  @@ -15,7 +15,7 @@
15 15
16 16 /*/*$servername = "localhost";
17 17 $username = "smartcharging";
18 - $password = "LXRLBaEAuRr7M7jY";*/*/
18 + $password = "LXRLBaEAuRr7M7jY";*/
19 19
20 20 //$params = json_decode($_REQUEST["params"], true);
21 21
  @@ -39,7 +39,9 @@
39 39 $user_repo = new UserRepository($conn);
40 40
41 41 $user->username = $params["username"];
42 - $user->nominativo = $params["nominativo"];
42 + //$user->nominativo = $params["nominativo"];
43 + $user->nome = $params["nome"];
44 + $user->cognome = $params["cognome"];
43 45 $user->cell = $params["cell"];
44 46 $user->email = $params["email"];
45 47 //$user->avatar = $params["avatar"];
  @@ -48,29 +50,29 @@
48 50 $statusUser = $user_repo->registerUser($user, $params["password"]);
49 51 $risposta["user_id"] = $statusUser["id"];
50 52
51 - $strToHash = $user->username.$user->nominativo.$user->cell.$user->email;
53 + $strToHash = $user->username.$user->nome.$user->cognome.$user->cell.$user->email;
52 54
53 55 if ($params["avatar"] != "") {
54 56 $imgExtention = substr(strrchr($params["avatar"],'.'),1);
55 57 $risposta["avatar_name"] = uniqid().".".$imgExtention;
56 58 }
57 -
58 59 if ($statusUser["return"]!=0) {
59 - $risposta["local_id"] = -1;
60 - $risposta["return"] = $statusUser["return"];
61 -
62 - echo json_encode($risposta);
60 + echo json_encode($statusUser);
63 61 } else {
64 62 $local_repo = new LocalRepository($conn);
65 63
66 - $local->id_utente_owner = $risposta["user_id"];
67 - $local->nomelocale = $params["nomelocale"];
68 - $local->descrizione = $params["descrizione"];
69 - $local->tipologia = $params["tipologia"];
70 - //$local->imgs = $params["imgs"];
71 - $local->lat = array_key_exists("lat", $params) ? $params["lat"] : null;
72 - $local->lon = array_key_exists("lon", $params) ? $params["lon"] : null;
73 - $local->indirizzo = array_key_exists("indirizzo", $params) ? $params["indirizzo"] : null;
64 + $local->id_utente_owner = $risposta["user_id"];
65 + $local->nomelocale = $params["nomelocale"];
66 + $local->descrizione = $params["descrizione"];
67 + $local->tipologia = $params["tipologia"];
68 + //$local->imgs = $params["imgs"];
69 + $local->lat = array_key_exists("lat", $params) ? $params["lat"] : null;
70 + $local->lon = array_key_exists("lon", $params) ? $params["lon"] : null;
71 + $local->indirizzo = array_key_exists("indirizzo", $params) ? $params["indirizzo"] : null;
72 + $local->email = $params["email"];
73 + $local->telefono = array_key_exists("telefono", $params) ? $params["telefono"] : "";
74 + $local->sito = array_key_exists("sito", $params) ? $params["sito"] : "";
75 + $local->n_punti_ricarica = $params["n_punti_ricarica"];
74 76
75 77 $statusLocal = $local_repo->registerLocal($local);
76 78 $risposta["local_id"] = $statusLocal["local_id"];
  @@ -79,16 +81,17 @@
79 81
80 82 $localImgs = array_key_exists("imgs", $params) ? $params["imgs"] : null;
81 83
82 - if ($risposta["return"] == 0 && count($localImgs)>0) {
84 + if ($risposta["return"] == 0 && count($localImgs)>0 && $localImgs[0] != "") {
83 85 foreach($localImgs as $image) {
84 - rename($_SERVER['DOCUMENT_ROOT'].TEMP_IMAGES_PATH.session_id()."/".$image, $_SERVER['DOCUMENT_ROOT'].IMAGES_PATH.$image);
86 + //rename($_SERVER['DOCUMENT_ROOT'].TEMP_IMAGES_PATH.session_id()."/".$image, $_SERVER['DOCUMENT_ROOT'].IMAGES_PATH.$image);
87 + rename($_SERVER['DOCUMENT_ROOT'].TEMP_IMAGES_PATH."/".$image, $_SERVER['DOCUMENT_ROOT'].IMAGES_PATH.$image);
85 88 }
86 89 //rmdir("./images/temp/".session_id()."/");
87 - deleteDirectory($_SERVER['DOCUMENT_ROOT'].TEMP_IMAGES_PATH.session_id()."/");
90 + //deleteDirectory($_SERVER['DOCUMENT_ROOT'].TEMP_IMAGES_PATH.session_id()."/");
88 91 $local_repo->addImages($risposta["local_id"], $localImgs);
89 92 }
90 93
91 - unset($_SESSION["images"]);
94 + //unset($_SESSION["images"]);
92 95
93 96 echo json_encode($risposta);
94 97 }