Merge pull request #21 from 5a2v0/master

new getall() function

Author: ffissore

bridge/php/bridgeclient.class.php

@@ -15,7 +15,7 @@
 Usage
 -----
 The usage is the same as bridgeclient.py
-You have just two methods: get and put (see example.php)
+You have just three methods: get, put and getall (see example.php)
 
 */
 
@@ -39,14 +39,15 @@ private function disconnect() {
 		socket_close($this->socket);
 	}
 
-	private function sendcommand($command,$key,$value="") {
+	private function sendcommand($command,$key="",$value="") {
 		$jsonreceive = "";
 		$obraces=0;
 		$cbraces=0;
 
 		$this->connect();
 
-		$jsonsend = '{"command":"'.$command.'","key":"'.$key.'","value":"'.$value.'"}';
+		if($key<>""){$jsonsend = '{"command":"'.$command.'","key":"'.$key.'","value":"'.$value.'"}';}
+		else{$jsonsend = '{"command":"'.$command.'"}';}
 		socket_write($this->socket, $jsonsend, strlen($jsonsend));
 
 		do {
@@ -58,10 +59,15 @@ private function sendcommand($command,$key,$value="") {
 
 		$this->disconnect();
 
-		$jsonarray=json_decode($jsonreceive);
-		if ($jsonarray->{'value'} == NULL) $jsonarray->{'value'}="None";
+		if($key<>""){
+			$jsonarray=json_decode($jsonreceive);
+			if ($jsonarray->{'value'} == NULL) $jsonarray->{'value'}="None";
 
-		return $jsonarray->{'value'};
+			return $jsonarray->{'value'};
+		}
+		else{
+			return $jsonreceive;
+		}
 	}
 
 	public function get($key) {
@@ -71,6 +77,10 @@ public function get($key) {
 	public function put($key,$value) {
 		return $this->sendcommand("put",$key,$value);
 	}
+	
+	public function getall() {
+		return $this->sendcommand("get");
+	}
 
 }
 ?>

bridge/php/example.php

@@ -4,7 +4,12 @@
 $client = new bridgeclient();
 
 $client->put("D13","Test");
-$test= $client->get("D13");
+
+$test = $client->get("D13");
 echo $test;
+
+$all = $client->getall();
+$all = json_decode($all, true);
+print_r($all);
 ?>