Changeset 4850

Timestamp:

Dec 26, 2007, 2:22:00 PM (15 years ago)

Author:

ebihara

Message:

#1621:レビューのプロキシ対応コードの取り込み（とりあえず2.10時点のライブラリ対応版）

Location:

OpenPNE/trunk

Files:

• lib/include/Services/Amazon.php (modified) (3 diffs)
• webapp/lib/db/review.php (modified) (2 diffs)

OpenPNE/trunk/lib/include/Services/Amazon.php

@@ -107 +107 @@
     */
     var $_baseurl = null;
+ 
+   /**
+    * The proxy parameters to be used by HTTP_Request
+    *
+    * @access private
+    * @var    string $_proxy_host
+    * @var    int    $_proxy_port
+    * @var    string $_proxy_user
+    * @var    string $_proxy_pass
+    */
+    var $_proxy_host = null;
+    var $_proxy_port = null;
+    var $_proxy_user = null;
+    var $_proxy_pass = null;
 
     /**
@@ -234 +248 @@
     function getLocale() {
         return $this->_locale;
+    }
+    
+   /**
+    * Sets a proxy to be used by HTTP_Request
+    *
+    * @param string     Proxy host
+    * @param int        Proxy port
+    * @param string     Proxy username
+    * @param string     Proxy password
+    * @access public
+    */
+    function setProxy($host, $port = 8080, $user = null, $pass = null)
+    {
+        $this->_proxy_host = $host;
+        $this->_proxy_port = $port;
+        $this->_proxy_user = $user;
+        $this->_proxy_pass = $pass;
     }
     
@@ -769 +800 @@
         // request for the URL.
         $http = &new HTTP_Request($url);
+        if ($this->_proxy_host) $http->setProxy($this->_proxy_host, $this->_proxy_port, $this->_proxy_user, $this->_proxy_pass);
         $http->addHeader('User-Agent', 'Services_Amazon/' . $this->getApiVersion());
         $http->sendRequest();

OpenPNE/trunk/webapp/lib/db/review.php

@@ -97 +97 @@
     include_once 'Services/Amazon.php';
     $amazon =& new Services_Amazon(AMAZON_TOKEN, AMAZON_AFFID, AMAZON_LOCALE, AMAZON_BASEURL);
+    $amazon->setLocale(AMAZON_LOCALE);
+    if (OPENPNE_USE_HTTP_PROXY) $amazon->setProxy(OPENPNE_HTTP_PROXY_HOST, OPENPNE_HTTP_PROXY_PORT);
     $products = $amazon->searchKeyword($keyword, $category, $page);
     if (PEAR::isError($products)) {
@@ -131 +133 @@
     include_once 'Services/Amazon.php';
     $amazon =& new Services_Amazon(AMAZON_TOKEN, AMAZON_AFFID, AMAZON_LOCALE, AMAZON_BASEURL);
+    $amazon->setLocale(AMAZON_LOCALE);
+    if (OPENPNE_USE_HTTP_PROXY) $amazon->setProxy(OPENPNE_HTTP_PROXY_HOST, OPENPNE_HTTP_PROXY_PORT);
     $keyword = mb_convert_encoding($keyword, "UTF-8", "auto");