Changeset 754

Timestamp:

01/14/10 11:12:20 (2 years ago)

Author:

nate

Message:

• Fixed misnamed variable name in _callServer function.
• Added encoding function, and encoded relevant information sent to the target script.
• Stripped out superfluous header information in a response from the target script.

Files:

• trunk/phpbms/modules/api/apiwrapper.php (modified) (6 diffs)

trunk/phpbms/modules/api/apiwrapper.php

@@ -113 +113 @@
      * 
      * @param string $tabledefuuid The uuid of the tabledefinition that you wish to get records.
-     * @param array $data An array of table uuids (or integer ids if useUuid option is set to false)
+     * @param array $data An array of associative arrays of table uuids (or integer ids if useUuid option is set to false).  The key=>value format is 'uuid'=>'{the actual uuid}'
      * @param array $options An associative array of options. Possible options are : 'useUuid', 'dateFormat', 'timeFormat'
      *
@@ -460 +460 @@
     
     /*
+     * function _encode
+     * 
+     * @param array $message Message to be encoded
+     * 
+     * @return string Encoded message
+     */
+    
+    private function _encode($message) {
+        
+        return json_encode($message);
+        
+    }//end function
+    
+    
+    /*
      * function _decode
      * 
@@ -487 +502 @@
         $params["phpbmspassword"] = $this->password;
         
+        if(!isset($params["request"]))
+            $params["request"] = array();
+        
+        $params["request"] = $this->_encode($params["request"]);
+            
+        
         $this->errorMessage = "";
         $this->errorCode = "";
         
-        $post_vars = $this->httpBuildQuery($params);
+        $post_vars = http_build_query($params);
         
         $payload = "POST " .$this->apiUrl. " HTTP/1.0\r\n";
@@ -507 +528 @@
                 $port = 443;
             
-            $sock = fsockopen("ssl://".$host, $port, $errno, $errstr, 30);
+            $sock = fsockopen("ssl://".$this->apiHostname, $port, $errno, $errstr, 30);
         } else {
             
@@ -515 +536 @@
                 $port = 80;
             
-            $sock = fsockopen($host, $port, $errno, $errstr, 30);
+            $sock = fsockopen($this->apiHostname, $port, $errno, $errstr, 30);
         }
         if(!$sock) {
@@ -538 +559 @@
         fclose($sock);
         ob_end_clean();
+        
+        list($throw, $response) = explode("\r\n\r\n", $response, 2);
+        
         if ($info["timed_out"]) return false;