From 2849b93af869922d20f5f04d7346939c604c861b Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 25 Dec 2011 17:06:42 -0800
Subject: [PATCH] Restore HTTP_Request2 support - I'll dupe the helper so that
 we support both versions of the library.

Revert "Revert "Converted to use PEAR's HTTP_Request2, since, according to http://pear.php.net/package/HTTP_Request/ HTTP_Request has been superceded by Request2. ""

This reverts commit b21689eb14c5895e14262ac0cba20295df5d453e.
---
 3.0/client/PHP/Gallery3.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/3.0/client/PHP/Gallery3.php b/3.0/client/PHP/Gallery3.php
index fb97ddf8..2f43f4ca 100644
--- a/3.0/client/PHP/Gallery3.php
+++ b/3.0/client/PHP/Gallery3.php
@@ -19,7 +19,7 @@
  */
 include("Mail.php");
 include("Mail/mime.php");
-include("HTTP/Request.php");
+include("HTTP/Request2.php");
 
 class Gallery3 {
   var $url;
@@ -170,30 +170,32 @@ class Gallery3 {
 
 class Gallery3_Helper {
   static function request($method, $url, $token=null, $params=array(), $file=null) {
-    $req = new HTTP_Request($url);
-    $req->setMethod($method == "get" ? HTTP_REQUEST_METHOD_GET : HTTP_REQUEST_METHOD_POST);
-    $req->addHeader("X-Gallery-Request-Method", $method);
+    $req = new HTTP_Request2($url);
+    $req->setMethod($method == "get" ? 'GET' : 'POST');
+    $req->setHeader("X-Gallery-Request-Method", $method);
     if ($token) {
-      $req->addHeader("X-Gallery-Request-Key", $token);
+      $req->setHeader("X-Gallery-Request-Key", $token);
     }
     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) {
       $req->addFile("file", $file, mime_content_type($file));
     }
-    $req->sendRequest();
+    $response = $req->send();
+    $status = $response->getStatus();
 
-    switch ($req->getResponseCode()) {
+    switch ($status) {
     case 200:
     case 201:
-      return json_decode($req->getResponseBody());
+      return json_decode($response->getBody());
 
     case 403:
-      throw new Gallery3_Forbidden_Exception($req->getResponseBody());
+      throw new Gallery3_Forbidden_Exception($response->getBody(),$status);
 
     default:
-      throw new Gallery3_Exception($req->getResponseBody());
+      throw new Gallery3_Exception($response->getBody(),$status);
     }
   }
 }