tweet_live: comparison web/lib/Zend/Service/Amazon/S3.php

equal deleted inserted replaced

-:2251fb41dbc7
+:1e110b03ae96
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Service
 * @subpackage Amazon_S3
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: S3.php 23224 2010-10-22 13:45:57Z matthew $
+* @version    $Id: S3.php 24593 2012-01-05 20:35:02Z matthew $
 */
 /**
 * @see Zend_Service_Amazon_Abstract
 */
 * Amazon S3 PHP connection class
 *
 * @category   Zend
 * @package    Zend_Service
 * @subpackage Amazon_S3
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 * @see        http://docs.amazonwebservices.com/AmazonS3/2006-03-01/
 */
 class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract
 {
 * @return boolean
 */
 public function createBucket($bucket, $location = null)
 {
 $this->_validBucketName($bucket);
+$headers=array();
 if($location) {
 $data = '<CreateBucketConfiguration><LocationConstraint>'.$location.'</LocationConstraint></CreateBucketConfiguration>';
-}
+$headers[self::S3_CONTENT_TYPE_HEADER]= 'text/plain';
-else {
+$headers['Content-size']= strlen($data);
+} else {
 $data = null;
 }
-$response = $this->_makeRequest('PUT', $bucket, null, array(), $data);
+$response = $this->_makeRequest('PUT', $bucket, null, $headers, $data);
 return ($response->getStatus() == 200);
 }
 /**
 $objects = $this->getObjectsByBucket($bucket);
 if (!$objects) {
 return false;
 }
-foreach ($objects as $object) {
+while (!empty($objects)) {
-$this->removeObject("$bucket/$object");
+foreach ($objects as $object) {
-}
+$this->removeObject("$bucket/$object");
+}
+$params= array (
+'marker' => $objects[count($objects)-1]
+);
+$objects = $this->getObjectsByBucket($bucket,$params);
+}
 return true;
 }
 /**
 * List the objects in a bucket.
 }
 }
 return $objects;
 }
+/**
+* List the objects and common prefixes in a bucket.
+*
+* Provides the list of object keys and common prefixes that are contained in the bucket.  Valid params include the following.
+* prefix - Limits the response to keys which begin with the indicated prefix. You can use prefixes to separate a bucket into different sets of keys in a way similar to how a file system uses folders.
+* marker - Indicates where in the bucket to begin listing. The list will only include keys that occur lexicographically after marker. This is convenient for pagination: To get the next page of results use the last key of the current page as the marker.
+* max-keys - The maximum number of keys you'd like to see in the response body. The server might return fewer than this many keys, but will not return more.
+* delimiter - Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response.
+*
+* @see ZF-11401
+* @param  string $bucket
+* @param array $params S3 GET Bucket Paramater
+* @return array|false
+*/
+public function getObjectsAndPrefixesByBucket($bucket, $params = array())
+{
+$response = $this->_makeRequest('GET', $bucket, $params);
+if ($response->getStatus() != 200) {
+return false;
+}
+$xml = new SimpleXMLElement($response->getBody());
+$objects = array();
+if (isset($xml->Contents)) {
+foreach ($xml->Contents as $contents) {
+foreach ($contents->Key as $object) {
+$objects[] = (string)$object;
+}
+}
+}
+$prefixes = array();
+if (isset($xml->CommonPrefixes)) {
+foreach ($xml->CommonPrefixes as $prefix) {
+foreach ($prefix->Prefix as $object) {
+$prefixes[] = (string)$object;
+}
+}
+}
+return array(
+'objects'  => $objects,
+'prefixes' => $prefixes
+);
+}
 /**
 * Make sure the object name is valid
 *
 * @param  string $object
 * @return string
 if (!isset($meta[self::S3_CONTENT_TYPE_HEADER])) {
 $meta[self::S3_CONTENT_TYPE_HEADER] = self::getMimeType($path);
 }
 if(!isset($meta['Content-MD5'])) {
-$headers['Content-MD5'] = base64_encode(md5_file($path, true));
+$meta['Content-MD5'] = base64_encode(md5_file($path, true));
 }
 return $this->putObject($object, $data, $meta);
 }
 }
 /**
 * Make a request to Amazon S3
 *
-* @param  string $method	Request method
+* @param  string $method    Request method
-* @param  string $path		Path to requested object
+* @param  string $path        Path to requested object
-* @param  array  $params	Request parameters
+* @param  array  $params    Request parameters
-* @param  array  $headers	HTTP headers
+* @param  array  $headers    HTTP headers
-* @param  string|resource $data		Request data
+* @param  string|resource $data        Request data
 * @return Zend_Http_Response
 */
 public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null)
 {
 $retry_count = 0;
 if ($parts[0]) {
 // prepend bucket name to the hostname
 $endpoint->setHost($parts[0].'.'.$endpoint->getHost());
 }
 if (!empty($parts[1])) {
-$endpoint->setPath('/'.$parts[1]);
+// ZF-10218, ZF-10122
+$pathparts = explode('?',$parts[1]);
+$endpath = $pathparts[0];
+$endpoint->setPath('/'.$endpath);
 }
 else {
 $endpoint->setPath('/');
 if ($parts[0]) {
 $path = $parts[0].'/';
 }
 }
 self::addSignature($method, $path, $headers);
 $client = self::getHttpClient();
-$client->resetParameters();
+$client->resetParameters(true);
 $client->setUri($endpoint);
 $client->setAuth(false);
 // Work around buglet in HTTP client - it doesn't clean headers
 // Remove when ZHC is fixed
+/*
 $client->setHeaders(array('Content-MD5'              => null,
 'Content-Encoding'         => null,
 'Expect'                   => null,
 'Range'                    => null,
 'x-amz-acl'                => null,
 'x-amz-copy-source'        => null,
 'x-amz-metadata-directive' => null));
+*/
 $client->setHeaders($headers);
 if (is_array($params)) {
 foreach ($params as $name=>$value) {
 $client->setParameterGet($name, $value);
 if (($method == 'PUT') && ($data !== null)) {
 if (!isset($headers['Content-type'])) {
 $headers['Content-type'] = self::getMimeType($path);
 }
 $client->setRawData($data, $headers['Content-type']);
 }
 do {
 $retry = false;
 $response = $client->request($method);
 $response_code = $response->getStatus();
 $sig_str .= '?acl';
 }
 else if (strpos($path, '?torrent') !== false) {
 $sig_str .= '?torrent';
 }
+else if (strpos($path, '?versions') !== false) {
+$sig_str .= '?versions';
+}
 $signature = base64_encode(Zend_Crypt_Hmac::compute($this->_getSecretKey(), 'sha1', utf8_encode($sig_str), Zend_Crypt_Hmac::BINARY));
 $headers['Authorization'] = 'AWS '.$this->_getAccessKey().':'.$signature;
 return $sig_str;

changeset 886	1e110b03ae96
parent 807	877f952ae2bd
child 1230	68c69c656a2c