Nextrek
Subversion Repository Public Repository

Nextrek

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 533 vs 537 for /Android/SmartCharging/endPoints/nightly/repositories/UserRepository.php

Diff revisions: vs.
  @@ -1,6 +1,7 @@
1 1 <?php
2 2 require_once('UserRepositoryInterface.php');
3 3 require_once(dirname(__FILE__)."/../constants.php");
4 + require_once(dirname(__FILE__)."/../utilities.php");
4 5 define('FACEBOOK_SDK_V4_SRC_DIR', dirname(__FILE__).'/../fb_SDK/src/Facebook/');
5 6 require_once(dirname(__FILE__)."/../fb_SDK/autoload.php");
6 7 use Facebook\FacebookSession;
  @@ -36,16 +37,18 @@
36 37
37 38 try {
38 39
39 - if (!$this->checkUserName($user)) {
40 + if (!$this->checkUserName($user)) { //username già registrato
41 + $status = createErrorMessage(1, "Username già registrato");
40 42 $status["id"] = -1;
41 - $status["return"] = 1; //username già registrato
43 + $status["return"] = 1;
42 44 $status["token"] = "";
43 45 return $status;
44 46 }
45 47
46 - if (!$this->checkEmail($user)) {
48 + if (!$this->checkEmail($user)) { //email già registrata
49 + $status = createErrorMessage(2, "Email già registrata");
47 50 $status["id"] = -1;
48 - $status["return"] = 2; //email già registrata
51 + //$status["return"] = 2;
49 52 $status["token"] = "";
50 53 return $status;
51 54 }
  @@ -72,8 +75,9 @@
72 75 //echo "New record created successfully";
73 76 } catch (PDOException $e) {
74 77 echo $e->getMessage();
78 + $status = createErrorMessage(3, "Errore DB");
75 79 $status["id"] = -1;
76 - $status["return"] = 3;
80 + //$status["return"] = 3;
77 81 $status["token"] = "";
78 82 return $status;
79 83 }
  @@ -84,11 +88,21 @@
84 88 $status = array();
85 89
86 90 try {
87 - $query = "SELECT id, password, email FROM utente WHERE username='".$username."'";
91 + $query = "SELECT id, password, email, is_owner FROM utente WHERE username='".$username."'";
88 92 $result = $this->db->query($query);
89 93 $row = ($result->rowCount()>0) ? $result->fetch() : null;
90 94
91 - if (!is_null($row) && password_verify($password, $row["password"])) {
95 + if (is_null($row)) {
96 + $status = createErrorMessage(1, "Username non valido");
97 + //$status["return"] = 1;
98 + $status["id"] = -1;
99 + $status["token"] = "";
100 + } else if (!password_verify($password, $row["password"])) {
101 + $status = createErrorMessage(1, "Password non valida");
102 + //$status["return"] = 1;
103 + $status["id"] = -1;
104 + $status["token"] = "";
105 + } else {
92 106 //$newToken = sha1($row["email"].session_id().time());
93 107 $newToken = sha1($username.session_id().time());
94 108
  @@ -101,19 +115,17 @@
101 115 $this->db->exec($queryToken);
102 116
103 117 $status["return"] = 0;
118 + $status["is_owner"] = $row["is_owner"];
104 119 $status["id"] = $row["id"];
105 120 $status["token"] = $newToken;
106 - } else {
107 - $status["return"] = 1;
108 - $status["id"] = -1;
109 - $status["token"] = "";
110 121 }
111 122
112 123 return $status;
113 124
114 125 } catch (PDOException $e) {
115 126 echo $e->getMessage();
116 - $status["return"] = 2;
127 + $status = createErrorMessage(2, "Errore DB");
128 + //$status["return"] = 2;
117 129 $status["id"] = -1;
118 130 $status["token"] = "";
119 131 return $status;
  @@ -131,7 +143,8 @@
131 143 return $status;
132 144 } catch (PDOException $e) {
133 145 echo $e->getMessage();
134 - $status["return"] = 1;
146 + $status = createErrorMessage(1, "Errore DB");
147 + //$status["return"] = 1;
135 148 return $status;
136 149 }
137 150 }
  @@ -149,7 +162,8 @@
149 162 $session->validate();
150 163
151 164 if (!isset($session)) {
152 - $status["return"] = 1;
165 + $status = createErrorMessage(1, "Sessione FB non valida");
166 + //$status["return"] = 1;
153 167 $status["id"] = -1;
154 168 $status["token"] = "";
155 169 return $status;
  @@ -161,7 +175,8 @@
161 175 $graphObject = $response->getGraphObject();
162 176
163 177 if ($fb_user != $graphObject->getProperty('id')) { //Il token ricevuto non coincide con quello di FB
164 - $status["return"] = 1;
178 + $status = createErrorMessage(1, "Il token ricevuto non coincide con quello di FB");
179 + //$status["return"] = 1;
165 180 $status["id"] = -1;
166 181 $status["token"] = "";
167 182 return $status;
  @@ -203,7 +218,8 @@
203 218
204 219 } catch (Exception $e) {
205 220 echo $e->getMessage();
206 - $status["return"] = 1;
221 + $status = createErrorMessage(1, "Errore DB");
222 + //$status["return"] = 1;
207 223 $status["id"] = -1;
208 224 $status["token"] = "";
209 225 $status["username"] = "";
  @@ -237,7 +253,8 @@
237 253 $status["id"] = $user_id;
238 254 $status["avatar"] = IMAGE_SERVER.AVATAR_PATH.$row["avatar"];
239 255 } else {
240 - $status["return"] = 1;
256 + $status = createErrorMessage(1, "User ID non disponibile");
257 + //$status["return"] = 1;
241 258 $status["id"] = -1;
242 259 $status["avatar"] = "";
243 260 }
  @@ -246,7 +263,8 @@
246 263
247 264 } catch (PDOException $e) {
248 265 echo $e->getMessage();
249 - $status["return"] = 1;
266 + $status = createErrorMessage(1, "Errore DB");
267 + //$status["return"] = 1;
250 268 $status["id"] = -1;
251 269 $status["avatar"] = "";
252 270 return $status;
  @@ -269,7 +287,8 @@
269 287 return $status;
270 288 } catch (PDOException $e) {
271 289 echo $e->getMessage();
272 - $status["return"] = 1;
290 + $status = createErrorMessage(1, "Errore DB");
291 + //$status["return"] = 1;
273 292 $status["avatar_name"] = "";
274 293 return $status;
275 294 }
  @@ -309,7 +328,8 @@
309 328
310 329 } catch (PDOException $e) {
311 330 echo $e->getMessage();
312 - $status["return"] = 1;
331 + $status = createErrorMessage(1, "Errore DB");
332 + //$status["return"] = 1;
313 333 return $status;
314 334 }
315 335
  @@ -327,7 +347,8 @@
327 347 return $status;
328 348 } catch (PDOException $e) {
329 349 echo $e->getMessage();
330 - $status["return"] = 1;
350 + $status = createErrorMessage(1, "Errore DB");
351 + //$status["return"] = 1;
331 352 return $status;
332 353 }
333 354 }

View View this file contents

History View the full history

Feeds

Commits for /Android/SmartCharging/endPoints/nightly/repositories/UserRepository.php

Need assistance?   Get in touch, or head to our documentation site.