Merge branch 'MDL-30126-MOODLE_22_STABLE' of git://github.com/mouneyr…

…ac/moodle into MOODLE_22_STABLE
moodle · Feb 14, 2012 · 32d4d0d · 32d4d0d
2 parents 4ab3a01 + 9c228a6
commit 32d4d0d
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/webservice/rest/lib.php b/webservice/rest/lib.php
@@ -21,17 +21,21 @@
  */
 class webservice_rest_client {
 
+    /** @var moodle_url the REST server url */
     private $serverurl;
+
     private $token;
+    private $format;
 
     /**
      * Constructor
      * @param string $serverurl a Moodle URL
      * @param string $token
      */
-    public function __construct($serverurl, $token) {
+    public function __construct($serverurl, $token, $format = 'xml') {
-        $this->serverurl = $serverurl;
+        $this->serverurl = new moodle_url($serverurl);
         $this->token = $token;
+        $this->format = $format;
     }
 
     /**
@@ -51,11 +55,22 @@ public function set_token($token) {
     public function call($functionname, $params) {
         global $DB, $CFG;
 
-        $result = download_file_content($this->serverurl
+         if ($this->format == 'json') {
-                        . '?wstoken='.$this->token.'&wsfunction='
+             $formatparam = '&moodlewsrestformat=json';
-                        . $functionname, null, $params);
+             $this->serverurl->param('moodlewsrestformat','json');
+         } else {
+             $formatparam = ''; //to keep retro compability with old server that only support xml (they don't expect this param)
+         }
+
+        $this->serverurl->param('wstoken',$this->token);
+        $this->serverurl->param('wsfunction',$functionname); //you could also use params().
+
+        $result = download_file_content($this->serverurl->out(false), null, $params);
 
         //TODO : transform the XML result into PHP values - MDL-22965
+        if ($this->format == 'json') {
+            $result = json_decode($result);
+        }
 
         return $result;
     }