public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #84 from wrlee/patch-1

Browse Source 
Converted to use PEAR's HTTP_Request2 rather than HTTP_Request
This commit is contained in:
Bharat Mediratta 2011-10-03 21:20:58 -07:00
commit 6b7bcf780f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
3.0/client/PHP/Gallery3.php
View File

@ -19,7 +19,7 @@
*/ */
include("Mail.php"); include("Mail.php");
include("Mail/mime.php"); include("Mail/mime.php");
include("HTTP/Request.php"); include("HTTP/Request2.php");
class Gallery3 { class Gallery3 {
var $url; var $url;
@ -170,30 +170,32 @@ class Gallery3 {
class Gallery3_Helper { class Gallery3_Helper {
static function request($method, $url, $token=null, $params=array(), $file=null) { static function request($method, $url, $token=null, $params=array(), $file=null) {
$req = new HTTP_Request($url); $req = new HTTP_Request2($url);
$req->setMethod($method == "get" ? HTTP_REQUEST_METHOD_GET : HTTP_REQUEST_METHOD_POST); $req->setMethod($method == "get" ? 'GET' : 'POST');
$req->addHeader("X-Gallery-Request-Method", $method); $req->setHeader("X-Gallery-Request-Method", $method);
if ($token) { if ($token) {
$req->addHeader("X-Gallery-Request-Key", $token); $req->setHeader("X-Gallery-Request-Key", $token);
} }
foreach ($params as $key => $value) { foreach ($params as $key => $value) {
$req->addPostData($key, is_string($value) ? $value : json_encode($value)); // $req->addPostParameter($key, is_string($value) ? $value : json_encode($value));
$req->addPostParameter($key, $value);
} }
if ($file) { if ($file) {
$req->addFile("file", $file, mime_content_type($file)); $req->addFile("file", $file, mime_content_type($file));
} }
$req->sendRequest(); $response = $req->send();
$status = $response->getStatus();
switch ($req->getResponseCode()) { switch ($status) {
case 200: case 200:
case 201: case 201:
return json_decode($req->getResponseBody()); return json_decode($response->getBody());
case 403: case 403:
throw new Gallery3_Forbidden_Exception($req->getResponseBody()); throw new Gallery3_Forbidden_Exception($response->getBody(),$status);
default: default:
throw new Gallery3_Exception($req->getResponseBody()); throw new Gallery3_Exception($response->getBody(),$status);
} }
} }
} }