@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | $this->code = $code; |
35 | 35 | if($code == 'ok'){ |
36 | 36 | $this->data = $data_or_message; |
37 | - }else{ |
|
37 | + } else{ |
|
38 | 38 | $this->message = $data_or_message; |
39 | 39 | } |
40 | 40 | } |
41 | 41 | function __toString(){ |
42 | 42 | if($this->code == 'ok'){ |
43 | 43 | $s = $this->data === null? '' : json_encode($this->data); |
44 | - }else{ |
|
44 | + } else{ |
|
45 | 45 | $s = $this->message; |
46 | 46 | } |
47 | 47 | return sprintf('%-13s %12s %s', $this->cmd, $this->code, $s); |
@@ -156,13 +156,13 @@ discard block |
||
156 | 156 | try{ |
157 | 157 | if($this->send_req($cmd, $params) === false){ |
158 | 158 | $resp = new SSDB_Response('error', 'send error'); |
159 | - }else{ |
|
159 | + } else{ |
|
160 | 160 | $resp = $this->recv_resp($cmd, $params); |
161 | 161 | } |
162 | - }catch(SSDBException $e){ |
|
162 | + } catch(SSDBException $e){ |
|
163 | 163 | if($this->_easy){ |
164 | 164 | throw $e; |
165 | - }else{ |
|
165 | + } else{ |
|
166 | 166 | $resp = new SSDB_Response('error', $e->getMessage()); |
167 | 167 | } |
168 | 168 | } |
@@ -179,12 +179,12 @@ discard block |
||
179 | 179 | if($this->_easy){ |
180 | 180 | if($resp->not_found()){ |
181 | 181 | return NULL; |
182 | - }else if(!$resp->ok() && !is_array($resp->data)){ |
|
182 | + } else if(!$resp->ok() && !is_array($resp->data)){ |
|
183 | 183 | return false; |
184 | - }else{ |
|
184 | + } else{ |
|
185 | 185 | return $resp->data; |
186 | 186 | } |
187 | - }else{ |
|
187 | + } else{ |
|
188 | 188 | $resp->cmd = $cmd; |
189 | 189 | return $resp; |
190 | 190 | } |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | foreach($params as $p){ |
255 | 255 | if(is_array($p)){ |
256 | 256 | $req = array_merge($req, $p); |
257 | - }else{ |
|
257 | + } else{ |
|
258 | 258 | $req[] = $p; |
259 | 259 | } |
260 | 260 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $resp = $this->recv(); |
265 | 265 | if($resp === false){ |
266 | 266 | return new SSDB_Response('error', 'Unknown error'); |
267 | - }else if(!$resp){ |
|
267 | + } else if(!$resp){ |
|
268 | 268 | return new SSDB_Response('disconnected', 'Connection closed'); |
269 | 269 | } |
270 | 270 | if($resp[0] == 'noauth'){ |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | if($resp[0] == 'ok'){ |
323 | 323 | $val = isset($resp[1])? intval($resp[1]) : 0; |
324 | 324 | return new SSDB_Response($resp[0], $val); |
325 | - }else{ |
|
325 | + } else{ |
|
326 | 326 | $errmsg = isset($resp[1])? $resp[1] : ''; |
327 | 327 | return new SSDB_Response($resp[0], $errmsg); |
328 | 328 | } |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | if($resp[0] == 'ok'){ |
331 | 331 | $val = isset($resp[1])? floatval($resp[1]) : (float)0; |
332 | 332 | return new SSDB_Response($resp[0], $val); |
333 | - }else{ |
|
333 | + } else{ |
|
334 | 334 | $errmsg = isset($resp[1])? $resp[1] : ''; |
335 | 335 | return new SSDB_Response($resp[0], $errmsg); |
336 | 336 | } |
@@ -344,10 +344,10 @@ discard block |
||
344 | 344 | if($resp[0] == 'ok'){ |
345 | 345 | if(count($resp) == 2){ |
346 | 346 | return new SSDB_Response('ok', $resp[1]); |
347 | - }else{ |
|
347 | + } else{ |
|
348 | 348 | return new SSDB_Response('server_error', 'Invalid response'); |
349 | 349 | } |
350 | - }else{ |
|
350 | + } else{ |
|
351 | 351 | $errmsg = isset($resp[1])? $resp[1] : ''; |
352 | 352 | return new SSDB_Response($resp[0], $errmsg); |
353 | 353 | } |
@@ -363,14 +363,14 @@ discard block |
||
363 | 363 | if($size <= 1){ |
364 | 364 | if(count($resp) == 2){ |
365 | 365 | return new SSDB_Response('ok', $resp[1]); |
366 | - }else{ |
|
366 | + } else{ |
|
367 | 367 | return new SSDB_Response('server_error', 'Invalid response'); |
368 | 368 | } |
369 | - }else{ |
|
369 | + } else{ |
|
370 | 370 | $data = array_slice($resp, 1); |
371 | 371 | return new SSDB_Response('ok', $data); |
372 | 372 | } |
373 | - }else{ |
|
373 | + } else{ |
|
374 | 374 | $errmsg = isset($resp[1])? $resp[1] : ''; |
375 | 375 | return new SSDB_Response($resp[0], $errmsg); |
376 | 376 | } |
@@ -387,7 +387,7 @@ discard block |
||
387 | 387 | $data = array_slice($resp, 1); |
388 | 388 | } |
389 | 389 | return new SSDB_Response($resp[0], $data); |
390 | - }else{ |
|
390 | + } else{ |
|
391 | 391 | $errmsg = isset($resp[1])? $resp[1] : ''; |
392 | 392 | return new SSDB_Response($resp[0], $errmsg); |
393 | 393 | } |
@@ -398,10 +398,10 @@ discard block |
||
398 | 398 | if($resp[0] == 'ok'){ |
399 | 399 | if(count($resp) == 2){ |
400 | 400 | return new SSDB_Response('ok', (bool)$resp[1]); |
401 | - }else{ |
|
401 | + } else{ |
|
402 | 402 | return new SSDB_Response('server_error', 'Invalid response'); |
403 | 403 | } |
404 | - }else{ |
|
404 | + } else{ |
|
405 | 405 | $errmsg = isset($resp[1])? $resp[1] : ''; |
406 | 406 | return new SSDB_Response($resp[0], $errmsg); |
407 | 407 | } |
@@ -416,10 +416,10 @@ discard block |
||
416 | 416 | $data[$resp[$i]] = (bool)$resp[$i + 1]; |
417 | 417 | } |
418 | 418 | return new SSDB_Response('ok', $data); |
419 | - }else{ |
|
419 | + } else{ |
|
420 | 420 | return new SSDB_Response('server_error', 'Invalid response'); |
421 | 421 | } |
422 | - }else{ |
|
422 | + } else{ |
|
423 | 423 | $errmsg = isset($resp[1])? $resp[1] : ''; |
424 | 424 | return new SSDB_Response($resp[0], $errmsg); |
425 | 425 | } |
@@ -446,15 +446,15 @@ discard block |
||
446 | 446 | for($i=1; $i<count($resp); $i+=2){ |
447 | 447 | if($cmd[0] == 'z'){ |
448 | 448 | $data[$resp[$i]] = intval($resp[$i + 1]); |
449 | - }else{ |
|
449 | + } else{ |
|
450 | 450 | $data[$resp[$i]] = $resp[$i + 1]; |
451 | 451 | } |
452 | 452 | } |
453 | 453 | return new SSDB_Response('ok', $data); |
454 | - }else{ |
|
454 | + } else{ |
|
455 | 455 | return new SSDB_Response('server_error', 'Invalid response'); |
456 | 456 | } |
457 | - }else{ |
|
457 | + } else{ |
|
458 | 458 | $errmsg = isset($resp[1])? $resp[1] : ''; |
459 | 459 | return new SSDB_Response($resp[0], $errmsg); |
460 | 460 | } |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | } |
488 | 488 | @fflush($this->sock); |
489 | 489 | } |
490 | - }catch(Exception $e){ |
|
490 | + } catch(Exception $e){ |
|
491 | 491 | $this->close(); |
492 | 492 | throw new SSDBException($e->getMessage()); |
493 | 493 | } |
@@ -503,20 +503,20 @@ discard block |
||
503 | 503 | if($this->debug){ |
504 | 504 | echo '< ' . str_replace(array("\r", "\n"), array('\r', '\n'), $data) . "\n"; |
505 | 505 | } |
506 | - }catch(Exception $e){ |
|
506 | + } catch(Exception $e){ |
|
507 | 507 | $data = ''; |
508 | 508 | } |
509 | 509 | if($data === false || $data === ''){ |
510 | 510 | if(feof($this->sock)){ |
511 | 511 | $this->close(); |
512 | 512 | throw new SSDBException('Connection lost'); |
513 | - }else{ |
|
513 | + } else{ |
|
514 | 514 | throw new SSDBTimeoutException('Connection timeout'); |
515 | 515 | } |
516 | 516 | } |
517 | 517 | $this->recv_buf .= $data; |
518 | 518 | # echo "read " . strlen($data) . " total: " . strlen($this->recv_buf) . "\n"; |
519 | - }else{ |
|
519 | + } else{ |
|
520 | 520 | return $ret; |
521 | 521 | } |
522 | 522 | } |