root/OpenPNE_specification/patch/OpenPNE_2_10_x_Amazon_ticket_3982_4166_2_fix.patch

lib/include/Services/AmazonECS4.php

@@ -35 +35 @@
-* @category  Web Services
-* @package   Services_Amazon
-* @author    John Downey <jdowney@gmail.com>
-tsuruoka@p4life.jp
+atsuya.tsuruoka@gmail.com
-* @copyright 2004 John Downey
-* @license   http://www.freebsd.org/copyright/freebsd-license.html 2 Clause BSD License
-4 2006/08/04 10:31:00
+9 2008/04/02 04:23:38
-* @link      http://pear.php.net/package/Services_Amazon/
-* @filesource
-*/
-
-/**
+ * NOTICE:
+ * This class is for backward compatibility and should be considered obsolete.
+ * After August 15, 2009, all requests without a signature will be denied.
+ * You may as well use Services_Amazon when you create a new application.
+ */
+
+/**
-* Uses PEAR class for error management
-*/
-require_once 'PEAR.php';
@@ -91 +98 @@
-*
-* @package Services_Amazon
-* @author  John Downey <jdowney@gmail.com>
-tsuruoka@p4life.jp
+atsuya.tsuruoka@gmail.com
-* @access  public
-7.1
+8.0
-* @uses    PEAR
-* @uses    HTTP_Request
-* @uses    XML_Unserializer
@@ -240 +247 @@
-    */
-    function getApiVersion()
-    {
-7.1
+8.0
-    }
-
-    /**
@@ -888 +895 @@
-    function TransactionLookup($transaction_id, $options = array())
-    {
-        $params = $options;
-Similarity
+Transaction
-        $params['TransactionId'] = $transaction_id;
-        return $this->_sendRequest($params);
-    }

lib/include/Services/Amazon.php

@@ -1 +1 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-// This class is for backward compatibility and should be considered obsolete.
-// You may as well use Services_AmazonECS4 when you create a new application.
-
-/**
-
-
+ 
+ 
-require_once 'PEAR.php';
-
-/**
-
-
+ 
+ 
-require_once 'HTTP/Request.php';
-
-/**
-
-
+ 
+ 
-require_once 'XML/Unserializer.php';
-
-/**
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-class Services_Amazon
-{
-    /**
-* The developers token used when quering Amazon servers.
-
-
-* @var    string $_token
-
-token
-
+ * An Amazon Access Key ID used when quering Amazon servers
+ 
+ 
+ * @var    string
+ 
+access_key_id
+
-    /**
-* An Amazon Associate ID used in the URL's so a commision may be payed.
-
-
-* @var    string $_affid
-
-affid
-
+ * An Amazon Secret Access Key used when quering Amazon servers
+ 
+ 
+ * @var    string
+ 
+secret_access_key
+
-    /**
-* The locale to pass to Amazon.com's servers.
-
-
-* @var    string $_locale
-*/    
-locale
-
+ * An Amazon Associate Tag used in the URL's so a commision may be payed
+ 
+ 
+ * @var    string
+ */
+associate_tag
+
-    /**
-* The base url used to build the query for the Amazon servers.
-
-
-* @var    string $_baseurl
-
-null
+ * A base URL used to build the query for the Amazon servers
+ 
+ 
+ * @var    string
+ 
+SERVICES_AMAZON_BASEURL
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-* Sets the Developer token to use when quering Amazon's Web Services.
-
-
-* @param  string $token your Developer token
-
-* @see    getToken()
-*/
-function setToken($token) 
-_token = $token
+ * Sets a Subscription ID (for backward compatibility)
+ 
+ 
+ * @param  string $subid A Subscription ID
+ 
+ */
+function setSubscriptionID($subid)
+
+setAccessKeyID($subid)
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-* Sets the Associate ID to use when building links to Amazon.com.
-
-
-* @param  string $affid your Associate ID
-
-* @see    getAssociateID()
-*/
-function setAssociateID($affid) 
-ffid = $affid
+ * Sets an Associate Tag
+ 
+ 
+ * @param  string $associate_tag An Associate Tag
+ 
+ */
+function setAssociateTag($associate_tag)
+
+ssociate_tag = $associate_tag
-    }
-    
-    /**
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-* Sets the base url used when making a query to Amazon.com.
-
-
-* @param  string $baseurl the base url to use
-
-* @see    getBaseUrl()
-*/
-function setBaseUrl($baseurl) 
-base
+ * Sets the base URL
+ 
+ 
+ * @param  string $url The base url
+ 
+ */
+function setBaseUrl($url)
+
+
-    }
-
+
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        $urls = array(
-us' => 'http://webservices.amazon.com/onca/xml2
-uk' => 'http://webservices.amazon.co.uk/onca/xml2
-de' => 'http://webservices.amazon.de/onca/xml2
-jp' => 'http://webservices.amazon.co.jp/onca/xml2
-fr' => 'http://webservices.amazon.fr/onca/xml2
-ca' => 'http://webservices.amazon.ca/onca/xml2
+US' => 'http://ecs.amazonaws.com/onca/xml
+UK' => 'http://ecs.amazonaws.co.uk/onca/xml
+DE' => 'http://ecs.amazonaws.de/onca/xml
+JP' => 'http://ecs.amazonaws.jp/onca/xml
+FR' => 'http://ecs.amazonaws.fr/onca/xml
+CA' => 'http://ecs.amazonaws.ca/onca/xml
-        );
-this->_locale = strtolow
+locale = strtoupp
-        if (empty($urls[$locale])) {
-
+ PEAR::raiseError('Invalid locale')
-        }
-        $this->setBaseUrl($urls[$locale]);
+        return true;
-    }
+
+    /**
+     * Sets a version
+     *
+     * @access public
+     * @param  string $version A service version
+     * @return void
+     */
+    function setVersion($version)
+    {
+        $this->_version = $version;
+    }
+
+    /**
+     * Enables caching the data
+     *
+     * Requires Cache to be installed.
+     * Example:
+     * <code>
+     * <?php
+     * $amazon = new Services_Amazon('[your Access Key ID here]', '[your Secret Access key here]');
+     * $amazon->setCache('file', array('cache_dir' => 'cache/'));
+     * $amazon->setCacheExpire(86400); // 86400 seconds = 24 hours
+     * $result = $amazon->BrowseNodeLookup('283155');
+     * ?>
+     * </code>
+     *
+     * @access public
+     * @param  string $container Name of container class
+     * @param  array $container_options Array with container class options
+     * @return mixed A PEAR_Error on error, a true on success
+     * @see    setCacheExpire()
+     */
+    function setCache($container = 'file', $container_options = array())
+    {
+        if(!class_exists('Cache')){
+            @include_once 'Cache.php';
+        }
+        
+        @$cache = new Cache($container, $container_options);
+        
+        if (is_object($cache)) {
+            $this->_cache = $cache;
+        } else {
+            $this->_cache = null;
+            return PEAR::raiseError('Cache init failed');
+        }
+
+        return true;
+    }
-    
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
+
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
+
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+        return md5($str);
+    }
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-    /**
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
+        $params['Version'] = $this->_version;
+        $params['Timestamp'] = gmdate('Y-m-d\TH:i:s\Z', is_null($this->_timestamp) ? time() : $this->_timestamp);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $http = &new HTTP_Request($url);
+        $http->setHttpVer('1.0');
-        $http->addHeader('User-Agent', 'Services_Amazon/' . $this->getApiVersion());
-
-
-
-
-
-
+
+
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $data = $xml->getUnserializedData();
-
-
-
-
+
+
-        }
-        
-        // Prepare the data to be sent to _processPage
-        $data  = get_object_vars($data);
-        $pages = isset($data['TotalPages']) ? (int) $data['TotalPages'] : 1;
-        unset($data['TotalPages']);
-        $totalresults = isset($data['TotalResults']) ? $data['TotalResults'] : count($data);
-        unset($data['TotalResults']);
-
-$products = $this->_processPage($data);
-$products['page']  = $page
-$products['pages'] = $pages
-$products['totalresults'] = $totalresults;
+if (isset($data['Error'])) {
+    $this->_errors = $data['Error']
+    return PEAR::raiseError(implode(':', $this->getError()))
+}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
+
+    /**
+     * Checks error codes at the content elements
+     *
+     * @access private
+     * @param  array $content Values of the content elements
+     * @return array mixed A PEAR_Error on error, a true on success
+     * @see    _parseRawResult
+     */
+    function _checkContentError($content)
+    {
+        if (isset($content['Request']['Errors'])) {
+            $this->_errors = $content['Request']['Errors']['Error'];
+            return PEAR::raiseError(implode(':', $this->getError()));
+        } else if (isset($content[0])) {
+            $errors = array();
+            foreach ($content as $v) {
+                if (isset($v['Request']['Errors']['Error'])) {
+                    $errors = array_merge($errors, $v['Request']['Errors']['Error']);
+                }
+            }
+            if (!empty($errors)) {
+                $this->_errors = $errors;
+                return PEAR::raiseError(implode(':', $this->getError()));
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Sends the request to Amazon
+     *
+     * @access private
+     * @param  array $params The array of request parameters
+     * @return array The array of information returned by the query
+     */
+    function _sendRequest($params)
+    {
+        $this->_errors = array();
+
+        if (is_null($this->_access_key_id)) {
+            return PEAR::raiseError('Access Key ID have not been set');
+        }
+
+        $url = $this->_buildUrl($params);
+        $this->_lasturl = $url;
+        if (PEAR::isError($url)) {
+            return $url;
+        }
+
+        // Return cached data if available
+        $cache_id = false;
+        if (isset($this->_cache) && !$this->_ignoreCache($params['Operation'])) {
+            $cache_id = $this->_generateCacheId($params);
+            $cache = $this->_cache->get($cache_id);
+            if (!is_null($cache)) {
+                $this->_processing_time = 0;
+                return $cache;
+            }
+        }
+
+        $result = $this->_sendHttpRequest($url);
+        $this->_raw_result = $result;
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        $contents = $this->_parseRawResult($result);
+        if (PEAR::isError($contents)) {
+            return $contents;
+        }
+
+        if ($cache_id) {
+            $this->_cache->save($cache_id, $contents, $this->_cache_expire);
+        }
+
+        return $contents;
+    }
+
-}
-?>

lib/include/PHP/Compat/Function/hash_hmac.php

@@ +1 @@
+<?php
+
+require_once dirname(__FILE__) . '/hash.php';
+
+/**
+ * Replace hash_hmac()
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @license     LGPL - http://www.gnu.org/licenses/lgpl.html
+ * @copyright   2004-2007 Aidan Lister <aidan@php.net>, Arpad Ray <arpad@php.net>
+ * @link        http://php.net/function.hash_hmac
+ * @author      revulo <revulon@gmail.com>
+ * @since       PHP 5.1.2
+ * @require     PHP 4.0.1 (str_pad)
+ */
+function php_compat_hash_hmac($algo, $data, $key, $raw_output = false)
+{
+    // Block size (byte) for MD5, SHA-1 and SHA-256.
+    $blocksize = 64;
+
+    $ipad = str_repeat("\x36", $blocksize);
+    $opad = str_repeat("\x5c", $blocksize);
+
+    if (strlen($key) > $blocksize) {
+        $key = hash($algo, $key, true);
+    } else {
+        $key = str_pad($key, $blocksize, "\x00");
+    }
+
+    $ipad ^= $key;
+    $opad ^= $key;
+
+    return hash($algo, $opad . hash($algo, $ipad . $data, true), $raw_output);
+}
+
+
+// Define
+if (!function_exists('hash_hmac')) {
+    function hash_hmac($algo, $data, $key, $raw_output = false)
+    {
+        return php_compat_hash_hmac($algo, $data, $key, $raw_output);
+    }
+}

lib/include/PHP/Compat/Function/sha1.php

@@ +1 @@
+<?php
+
+/**
+ * Replace sha1()
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @license     LGPL - http://www.gnu.org/licenses/lgpl.html
+ * @copyright   2004-2007 Aidan Lister <aidan@php.net>, Arpad Ray <arpad@php.net>
+ * @link        http://php.net/function.sha1
+ * @author      revulo <revulon@gmail.com>
+ * @since       PHP 4.3.0
+ * @require     PHP 4.0.0
+ */
+function php_compat_sha1($str, $raw_output = false)
+{
+    $h0 = (int)0x67452301;
+    $h1 = (int)0xefcdab89;
+    $h2 = (int)0x98badcfe;
+    $h3 = (int)0x10325476;
+    $h4 = (int)0xc3d2e1f0;
+
+    $len = strlen($str);
+
+    $str .= "\x80";
+    $str .= str_repeat("\0", 63 - ($len + 8) % 64);
+    $str .= pack('N2', $len >> 29, $len << 3);
+
+    for ($i = 0; $i < strlen($str); $i += 64) {
+
+        $w = array();
+        for ($j = 0; $j < 16; ++$j) {
+            $index = $i + $j * 4;
+            $w[$j] = ord($str[$index])     << 24
+                   | ord($str[$index + 1]) << 16
+                   | ord($str[$index + 2]) << 8
+                   | ord($str[$index + 3]);
+        }
+        for ($j = 16; $j < 80; ++$j) {
+            $w[$j] = php_compat_sha1_rotl_helper($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+        }
+
+        $a = $h0;
+        $b = $h1;
+        $c = $h2;
+        $d = $h3;
+        $e = $h4;
+
+        for ($j = 0; $j < 80; ++$j) {
+            if ($j < 20) {
+                $f = ($b & $c) | (~$b & $d);
+                $k = (int)0x5a827999;
+            } else if ($j < 40) {
+                $f = $b ^ $c ^ $d;
+                $k = (int)0x6ed9eba1;
+            } else if ($j < 60) {
+                $f = ($b & $c) | ($b & $d) | ($c & $d);
+                $k = (int)0x8f1bbcdc;
+            } else {
+                $f = $b ^ $c ^ $d;
+                $k = (int)0xca62c1d6;
+            }
+
+            $t = php_compat_sha1_add32_helper(
+                 php_compat_sha1_add32_helper(
+                 php_compat_sha1_add32_helper(
+                 php_compat_sha1_add32_helper(
+                 php_compat_sha1_rotl_helper($a, 5), $f), $e), $k), $w[$j]);
+
+            $e = $d;
+            $d = $c;
+            $c = php_compat_sha1_rotl_helper($b, 30);
+            $b = $a;
+            $a = $t;
+        }
+
+        $h0 = php_compat_sha1_add32_helper($h0, $a);
+        $h1 = php_compat_sha1_add32_helper($h1, $b);
+        $h2 = php_compat_sha1_add32_helper($h2, $c);
+        $h3 = php_compat_sha1_add32_helper($h3, $d);
+        $h4 = php_compat_sha1_add32_helper($h4, $e);
+    }
+
+    $h0 &= (int)0xffffffff;
+    $h1 &= (int)0xffffffff;
+    $h2 &= (int)0xffffffff;
+    $h3 &= (int)0xffffffff;
+    $h4 &= (int)0xffffffff;
+
+    $hash = sprintf('%08x%08x%08x%08x%08x', $h0, $h1, $h2, $h3, $h4);
+
+    if ($raw_output) {
+        return pack('H*', $hash);
+    } else {
+        return $hash;
+    }
+}
+
+function php_compat_sha1_add32_helper($x, $y)
+{
+    $lsw = ($x & 0xffff) + ($y & 0xffff);
+    $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
+    return ($msw << 16) | ($lsw & 0xffff);
+}
+
+function php_compat_sha1_rotl_helper($x, $n)
+{
+    return ($x << $n) | ($x >> (32 - $n)) & (0x7fffffff >> (31 - $n));
+}
+
+// Define
+if (!function_exists('sha1')) {
+    function sha1($str, $raw_output = false)
+    {
+        return php_compat_sha1($str, $raw_output);
+    }
+}

lib/include/PHP/Compat/Function/hash_algos.php

@@ +1 @@
+<?php
+
+/**
+ * Replace hash_algos()
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @license     LGPL - http://www.gnu.org/licenses/lgpl.html
+ * @copyright   2004-2007 Aidan Lister <aidan@php.net>, Arpad Ray <arpad@php.net>
+ * @link        http://php.net/function.hash_algos
+ * @author      revulo <revulon@gmail.com>
+ * @since       PHP 5.1.2
+ * @require     PHP 4.0.0
+ */
+function php_compat_hash_algos()
+{
+    return array('md5', 'sha1', 'sha256');
+}
+
+
+// Define
+if (!function_exists('hash_algos')) {
+    function hash_algos()
+    {
+        return php_compat_hash_algos();
+    }
+}

lib/include/PHP/Compat/Function/sha256.php

@@ +1 @@
+<?php
+
+/**
+ * PHP implementation of SHA-256 hash function
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @license     LGPL - http://www.gnu.org/licenses/lgpl.html
+ * @copyright   2004-2007 Aidan Lister <aidan@php.net>, Arpad Ray <arpad@php.net>
+ * @link        http://php.net/function.hash
+ * @author      revulo <revulon@gmail.com>
+ * @require     PHP 4.0.0
+ */
+function php_compat_sha256($str, $raw_output = false)
+{
+    $h0 = (int)0x6a09e667;
+    $h1 = (int)0xbb67ae85;
+    $h2 = (int)0x3c6ef372;
+    $h3 = (int)0xa54ff53a;
+    $h4 = (int)0x510e527f;
+    $h5 = (int)0x9b05688c;
+    $h6 = (int)0x1f83d9ab;
+    $h7 = (int)0x5be0cd19;
+
+    $k = array(
+        (int)0x428a2f98, (int)0x71374491, (int)0xb5c0fbcf, (int)0xe9b5dba5,
+        (int)0x3956c25b, (int)0x59f111f1, (int)0x923f82a4, (int)0xab1c5ed5,
+        (int)0xd807aa98, (int)0x12835b01, (int)0x243185be, (int)0x550c7dc3,
+        (int)0x72be5d74, (int)0x80deb1fe, (int)0x9bdc06a7, (int)0xc19bf174,
+        (int)0xe49b69c1, (int)0xefbe4786, (int)0x0fc19dc6, (int)0x240ca1cc,
+        (int)0x2de92c6f, (int)0x4a7484aa, (int)0x5cb0a9dc, (int)0x76f988da,
+        (int)0x983e5152, (int)0xa831c66d, (int)0xb00327c8, (int)0xbf597fc7,
+        (int)0xc6e00bf3, (int)0xd5a79147, (int)0x06ca6351, (int)0x14292967,
+        (int)0x27b70a85, (int)0x2e1b2138, (int)0x4d2c6dfc, (int)0x53380d13,
+        (int)0x650a7354, (int)0x766a0abb, (int)0x81c2c92e, (int)0x92722c85,
+        (int)0xa2bfe8a1, (int)0xa81a664b, (int)0xc24b8b70, (int)0xc76c51a3,
+        (int)0xd192e819, (int)0xd6990624, (int)0xf40e3585, (int)0x106aa070,
+        (int)0x19a4c116, (int)0x1e376c08, (int)0x2748774c, (int)0x34b0bcb5,
+        (int)0x391c0cb3, (int)0x4ed8aa4a, (int)0x5b9cca4f, (int)0x682e6ff3,
+        (int)0x748f82ee, (int)0x78a5636f, (int)0x84c87814, (int)0x8cc70208,
+        (int)0x90befffa, (int)0xa4506ceb, (int)0xbef9a3f7, (int)0xc67178f2
+    );
+
+    $len = strlen($str);
+
+    $str .= "\x80";
+    $str .= str_repeat("\0", 63 - ($len + 8) % 64);
+    $str .= pack('N2', $len >> 29, $len << 3);
+
+    for ($i = 0; $i < strlen($str); $i += 64) {
+
+        $w = array();
+        for ($j = 0; $j < 16; ++$j) {
+            $index = $i + $j * 4;
+            $w[$j] = ord($str[$index])     << 24
+                   | ord($str[$index + 1]) << 16
+                   | ord($str[$index + 2]) << 8
+                   | ord($str[$index + 3]);
+        }
+        for ($j = 16; $j < 64; ++$j) {
+            $s0 = php_compat_sha256_rotr_helper($w[$j - 15],  7)
+                ^ php_compat_sha256_rotr_helper($w[$j - 15], 18)
+                ^ php_compat_sha256_shr_helper ($w[$j - 15],  3);
+
+            $s1 = php_compat_sha256_rotr_helper($w[$j - 2], 17)
+                ^ php_compat_sha256_rotr_helper($w[$j - 2], 19)
+                ^ php_compat_sha256_shr_helper ($w[$j - 2], 10);
+
+            $w[$j] = php_compat_sha256_add32_helper(
+                     php_compat_sha256_add32_helper(
+                     php_compat_sha256_add32_helper($w[$j - 16], $s0), $w[$j - 7]), $s1);
+        }
+
+        $a = $h0;
+        $b = $h1;
+        $c = $h2;
+        $d = $h3;
+        $e = $h4;
+        $f = $h5;
+        $g = $h6;
+        $h = $h7;
+
+        for ($j = 0; $j < 64; ++$j) {
+            $s1 = php_compat_sha256_rotr_helper($e,  6)
+                ^ php_compat_sha256_rotr_helper($e, 11)
+                ^ php_compat_sha256_rotr_helper($e, 25);
+
+            $ch = ($e & $f) ^ (~$e & $g);
+
+            $s0 = php_compat_sha256_rotr_helper($a,  2)
+                ^ php_compat_sha256_rotr_helper($a, 13)
+                ^ php_compat_sha256_rotr_helper($a, 22);
+
+            $maj = ($a & $b) ^ ($a & $c) ^ ($b & $c);
+
+            $t1 = php_compat_sha256_add32_helper(
+                  php_compat_sha256_add32_helper(
+                  php_compat_sha256_add32_helper(
+                  php_compat_sha256_add32_helper($h, $s1), $ch), $k[$j]), $w[$j]);
+
+            $t2 = php_compat_sha256_add32_helper($s0, $maj);
+
+            $h = $g;
+            $g = $f;
+            $f = $e;
+            $e = php_compat_sha256_add32_helper($d, $t1);
+            $d = $c;
+            $c = $b;
+            $b = $a;
+            $a = php_compat_sha256_add32_helper($t1, $t2);
+        }
+
+        $h0 = php_compat_sha256_add32_helper($h0, $a);
+        $h1 = php_compat_sha256_add32_helper($h1, $b);
+        $h2 = php_compat_sha256_add32_helper($h2, $c);
+        $h3 = php_compat_sha256_add32_helper($h3, $d);
+        $h4 = php_compat_sha256_add32_helper($h4, $e);
+        $h5 = php_compat_sha256_add32_helper($h5, $f);
+        $h6 = php_compat_sha256_add32_helper($h6, $g);
+        $h7 = php_compat_sha256_add32_helper($h7, $h);
+    }
+
+    $h0 &= (int)0xffffffff;
+    $h1 &= (int)0xffffffff;
+    $h2 &= (int)0xffffffff;
+    $h3 &= (int)0xffffffff;
+    $h4 &= (int)0xffffffff;
+    $h5 &= (int)0xffffffff;
+    $h6 &= (int)0xffffffff;
+    $h7 &= (int)0xffffffff;
+
+    $hash = sprintf('%08x%08x%08x%08x%08x%08x%08x%08x', $h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7);
+
+    if ($raw_output) {
+        return pack('H*', $hash);
+    } else {
+        return $hash;
+    }
+}
+
+function php_compat_sha256_add32_helper($x, $y)
+{
+    $lsw = ($x & 0xffff) + ($y & 0xffff);
+    $msw = ($x >> 16) + ($y >> 16) + ($lsw >> 16);
+    return ($msw << 16) | ($lsw & 0xffff);
+}
+
+function php_compat_sha256_shr_helper($x, $n)
+{
+    return ($x >> $n) & (0x7fffffff >> ($n - 1));
+}
+
+function php_compat_sha256_rotr_helper($x, $n)
+{
+    return ($x << (32 - $n)) | ($x >> $n) & (0x7fffffff >> ($n - 1));
+}

lib/include/PHP/Compat/Function/hash.php

@@ +1 @@
+<?php
+
+/**
+ * Replace hash()
+ *
+ * @category    PHP
+ * @package     PHP_Compat
+ * @license     LGPL - http://www.gnu.org/licenses/lgpl.html
+ * @copyright   2004-2007 Aidan Lister <aidan@php.net>, Arpad Ray <arpad@php.net>
+ * @link        http://php.net/function.hash
+ * @author      revulo <revulon@gmail.com>
+ * @since       PHP 5.1.2
+ * @require     PHP 4.0.0 (user_error)
+ */
+function php_compat_hash($algo, $data, $raw_output = false)
+{
+    $algo = strtolower($algo);
+    switch ($algo) {
+        case 'md5':
+            $hash = md5($data);
+            break;
+
+        case 'sha1':
+            if (!function_exists('sha1')) {
+                require dirname(__FILE__) . '/sha1.php';
+            }
+            $hash = sha1($data);
+            break;
+
+        case 'sha256':
+            if (!function_exists('php_compat_sha256')) {
+                require dirname(__FILE__) . '/sha256.php';
+            }
+            $hash = php_compat_sha256($data);
+            break;
+
+        default:
+            user_error('hash(): Unknown hashing algorithm: ' . $algo, E_USER_WARNING);
+            return false;
+    }
+
+    if ($raw_output) {
+        return pack('H*', $hash);
+    } else {
+        return $hash;
+    }
+}
+
+
+// Define
+if (!function_exists('hash')) {
+    function hash($algo, $data, $raw_output = false)
+    {
+        return php_compat_hash($algo, $data, $raw_output);
+    }
+}

config.php.sample

@@ -452 +452 @@
-///
-define('GOOGLE_AJAX_SEARCH_API_KEY', '');
-
+///
+// Amazon Product Advertising API
+// 2009年8月15日以降、Amazon の仕様変更の影響により
+// AMAZON_ACCESS_KEY_ID と AMAZON_SECRET_ACCESS_KEY を設定しないと、
+// レビュー機能がご利用いただけなくなりますのでご注意ください。
+// https://affiliate-program.amazon.com/gp/flex/advertising/api/sign-in-jp.html  から取得
+///
+define('AMAZON_ACCESS_KEY_ID', '');
+
+// Amazon Secret Access Key
+define('AMAZON_SECRET_ACCESS_KEY', '');
+
-//// SNSアプリケーション設定 ////
-
-// 管理画面のURL設定

webapp/lib/OpenPNE/Config.php

@@ -193 +193 @@
-            'OPENPNE_LOG_FUNCTION' => '',
-            'OPENPNE_EMOJI_DOCOMO_FOR_PC' => true,
-            'OPENPNE_SEND_NO_CACHE_HEADER' => false,
+            'AMAZON_ACCESS_KEY_ID' => '',
+            'AMAZON_SECRET_ACCESS_KEY' => '',
-        // 固定値
-            'AMAZON_TOKEN'   => '1WZYY1W9YF49AGM0RTG2',
-            'AMAZON_LOCALE'  => 'jp',
-webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService
+ecs.amazonaws.jp/onca/xml
-            'OPENPNE_REGIST_FROM_NONE'   => 0,
-            'OPENPNE_REGIST_FROM_PC'     => 1,
-            'OPENPNE_REGIST_FROM_KTAI'   => 2,

webapp/lib/OpenPNE/Amazon.php

@@ -4 +4 @@
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- */
-
-
+
+
-
-/**
- * OpenPNEでAmazonECSを利用するためのクラス
@@ -12 +13 @@
- * @package OpenPNE
- * @author Kousuke Ebihara <ebihara@tejimaya.com>
- */
-ECS4
+
-{
-    /**
-     * Category(AmazonECS3)とSearchIndexの変換テーブル

webapp/lib/db/review.php

@@ -96 +96 @@
-    }
-
-    require_once 'OpenPNE/Amazon.php';
-TOKEN
+ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY
-    $amazon->setLocale(AMAZON_LOCALE);
-    $amazon->setBaseUrl(AMAZON_BASEURL);
-
@@ -135 +135 @@
-function db_review_write_product4asin($asin)
-{
-    require_once 'OpenPNE/Amazon.php';
-TOKEN
+ACCESS_KEY_ID, AMAZON_SECRET_ACCESS_KEY
-    $amazon->setLocale(AMAZON_LOCALE);
-    $amazon->setBaseUrl(AMAZON_BASEURL);
-    $keyword = mb_convert_encoding($keyword, "UTF-8", "auto");