Remove videoS3 and Video Zencoder modules for D7 and VideoS3 module will continue as a stream wrapper.

17 files changed, 1 insertions, 4189 deletions

diff --git a/modules/video_s3/filesystem/video_s3.inc b/modules/video_s3/filesystem/video_s3.inc
deleted file mode 100644
index 1d54fb8..0000000
--- a/modules/video_s3/filesystem/video_s3.inc
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/*
- * @file
- * Class file used to store filesystem on the video.
- *
- */
-class video_s3 extends video_filesystem {
-
-  protected $params = array();
-  protected $name = 'Amazon S3';
-  protected $value = 'video_s3';
-
-  public function __construct() {
-
-  }
-
-  public function save_file($video) {
-
-  }
-
-  public function prepare_file($video) {
-
-  }
-
-  public function load_file(&$video) {
-    video_s3_video_load(&$video);
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/filesystem_interface#get_name()
-   */
-  public function get_name() {
-    return $this->name;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/filesystem_interface#get_help()
-   */
-  public function get_help() {
-    $help = t('Amazon Simple Storage Service (!s3) to store your video files. This free\'s up bandwidth from your site, providing a faster experience for your users. Simply enable this and enter your authentication details and your done! ', array('!s3' => l(t('Aamzon S3'), 'http://s3.amazonaws.com')));
-    return $help;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/filesystem_interface#get_value()
-   */
-  public function get_value() {
-    return $this->value;
-  }
-
-  public function run_command($options) {
-    return;
-  }
-
-  public function admin_settings() {
-    $form = array();
-    $form['amazon_s3_ssl'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Enable SSL?'),
-      '#default_value' => variable_get('amazon_s3_ssl', FALSE),
-      '#description' => t('If you would like to use ssl when transfering your files enable this option.'),
-    );
-    $form['amazon_s3_private'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Enable Private?'),
-      '#default_value' => variable_get('amazon_s3_private', FALSE),
-      '#description' => t('If you would like to use private transfering for your files enable this option.'),
-    );
-    $form['amazon_s3_lifetime'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Private Url Lifetime'),
-      '#default_value' => variable_get('amazon_s3_lifetime', '1800'),
-      '#size' => 5,
-    );
-
-
-    $form['amazon_s3_access_key'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Access Key ID'),
-      '#default_value' => variable_get('amazon_s3_access_key', ''),
-      '#size' => 50,
-    );
-    $form['amazon_s3_secret_access_key'] = array(
-      '#type' => 'password',
-      '#title' => t('Secret Access Key'),
-      '#default_value' => variable_get('amazon_s3_secret_access_key', ''),
-      '#description' => t('Once saved, you do not need to re-enter your secret key.  If you need to update your key, then fill this out to update it.'),
-      '#size' => 50,
-    );
-    //@todo Maybe move this to the admin settings page instead of global?
-    $form['amazon_s3_bucket'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Bucket'),
-      '#description' => t('Enter the bucket you wish to store your videos in.  If the bucket doesn\'t exist the system will attempt to create it.'),
-      '#default_value' => variable_get('amazon_s3_bucket', ''),
-      '#size' => 50,
-    );
-
-    //lets show our buckets in table format with a delete link.
-    //@todo add permissions
-    //were enabled, that means they have successfully connected and created a bucket.
-    if (variable_get('amazon_s3_access_key', false) && variable_get('video_filesystem', 'drupal') == 'video_s3') {
-      module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-      $s3 = new video_amazon_s3;
-      $s3->connect();
-      $buckets = $s3->s3->listBuckets();
-      // Setup our header.
-      $header = array(t('Bucket Name'), t('Total Objects'), t('Actions'));
-      $rows = array();
-      foreach ($buckets as $bucket) {
-        $objects = count($s3->s3->getBucket($bucket));
-        $actions = l(t('Delete'), 'admin/settings/video/amazon_s3/bucket/' . $bucket . '/delete');
-        $rows[] = array($bucket, $objects, $actions);
-      }
-      $form['amazon_info'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Amazon S3 Information'),
-        '#collapsible' => TRUE,
-        '#collapsed' => TRUE,
-      );
-      $form['amazon_info']['buckets'] = array(
-        '#type' => 'markup',
-        '#value' => theme('table', $header, $rows),
-      );
-    }
-    return $form;
-  }
-
-  public function admin_settings_validate(&$form, &$form_state) {
-    // Check for CURL
-    if (!extension_loaded('curl') && !@dl(PHP_SHLIB_SUFFIX == 'so' ? 'curl.so' : 'php_curl.dll')) {
-      form_set_error('amazon_s3', t('The CURL extension is not loaded.'));
-    } else {
-      $bucket = $form_state['values']['amazon_s3_bucket'];
-      // S3 buckets must contain only lower case alphanumeric characters, dots and dashes.
-      if (!preg_match("/^[a-z.-]+$/", $bucket)) {
-        form_set_error('amazon_s3_bucket', t('S3 buckets must contain only lower case alphanumeric characters, dots and dashes.'));
-      } else {
-        $access_key = $form_state['values']['amazon_s3_access_key'];
-        // check our secret key.
-        if (!empty($form_state['values']['amazon_s3_secret_access_key'])) {
-          $secret_key = $form_state['values']['amazon_s3_secret_access_key'];
-        } else {
-          // Add our secret key back in to persist its value.
-          $form_state['values']['amazon_s3_secret_access_key'] = variable_get('amazon_s3_secret_access_key', '');
-          $secret_key = variable_get('amazon_s3_secret_access_key', '');
-        }
-        $ssl = isset($form_state['values']['amazon_s3_ssl']) && $form_state['values']['amazon_s3_ssl'] ? TRUE : FALSE;
-        // Lets verify our credentials and verify our bucket exists, if not attempt to create it.
-        module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-        $s3 = new video_amazon_s3;
-        $s3->connect($access_key, $secret_key, $ssl);
-        $buckets = $s3->s3->listBuckets();
-        if (!$buckets || !(in_array($bucket, $buckets))) {
-          // Create a bucket with public read access
-          if ($s3->s3->putBucket($bucket, S3::ACL_PUBLIC_READ)) {
-            // set access control policy to zencoder if module is enabled
-            // @TODO : Add this to video_zencoder module
-            if (module_exists('video_zencoder')) {
-              $acp['acl'][] = array(
-                'type' => 'AmazonCustomerByEmail',
-                'email' => 'aws@zencoder.com',
-                'permission' => 'WRITE'
-              );
-              $s3->s3->setAccessControlPolicy($bucket, '', $acp);
-            }
-            drupal_set_message(t('Successfully created the bucket %bucket.', array('%bucket' => $bucket)));
-          } else {
-            form_set_error('amazon_s3_bucket', t('Could not verify or create the bucket %bucket.', array('%bucket' => $bucket)));
-          }
-        }
-      }
-    }
-  }
-
-}
-
-?>
diff --git a/modules/video_s3/includes/S3.php b/modules/video_s3/includes/S3.php
deleted file mode 100644
index e1fcb66..0000000
--- a/modules/video_s3/includes/S3.php
+++ /dev/null
@@ -1,1364 +0,0 @@
-<?php
-/**
-*
-* Copyright (c) 2008, Donovan Schönknecht.  All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* - Redistributions of source code must retain the above copyright notice,
-*   this list of conditions and the following disclaimer.
-* - Redistributions in binary form must reproduce the above copyright
-*   notice, this list of conditions and the following disclaimer in the
-*   documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*
-* Amazon S3 is a trademark of Amazon.com, Inc. or its affiliates.
-*/
-
-/**
-* Amazon S3 PHP class
-*
-* @link http://undesigned.org.za/2007/10/22/amazon-s3-php-class
-* @version 0.4.0
-*/
-class S3 {
-	// ACL flags
-	const ACL_PRIVATE = 'private';
-	const ACL_PUBLIC_READ = 'public-read';
-	const ACL_PUBLIC_READ_WRITE = 'public-read-write';
-	const ACL_AUTHENTICATED_READ = 'authenticated-read';
-
-	public static $useSSL = true;
-
-	private static $__accessKey; // AWS Access key
-	private static $__secretKey; // AWS Secret key
-
-
-	/**
-	* Constructor - if you're not using the class statically
-	*
-	* @param string $accessKey Access key
-	* @param string $secretKey Secret key
-	* @param boolean $useSSL Enable SSL
-	* @return void
-	*/
-	public function __construct($accessKey = null, $secretKey = null, $useSSL = true) {
-		if ($accessKey !== null && $secretKey !== null)
-			self::setAuth($accessKey, $secretKey);
-		self::$useSSL = $useSSL;
-	}
-
-
-	/**
-	* Set AWS access key and secret key
-	*
-	* @param string $accessKey Access key
-	* @param string $secretKey Secret key
-	* @return void
-	*/
-	public static function setAuth($accessKey, $secretKey) {
-		self::$__accessKey = $accessKey;
-		self::$__secretKey = $secretKey;
-	}
-
-
-	/**
-	* Get a list of buckets
-	*
-	* @param boolean $detailed Returns detailed bucket list when true
-	* @return array | false
-	*/
-	public static function listBuckets($detailed = false) {
-		$rest = new S3Request('GET', '', '');
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::listBuckets(): [%s] %s", $rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		$results = array();
-		if (!isset($rest->body->Buckets)) return $results;
-
-		if ($detailed) {
-			if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName))
-			$results['owner'] = array(
-				'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->ID
-			);
-			$results['buckets'] = array();
-			foreach ($rest->body->Buckets->Bucket as $b)
-				$results['buckets'][] = array(
-					'name' => (string)$b->Name, 'time' => strtotime((string)$b->CreationDate)
-				);
-		} else
-			foreach ($rest->body->Buckets->Bucket as $b) $results[] = (string)$b->Name;
-
-		return $results;
-	}
-
-
-	/*
-	* Get contents for a bucket
-	*
-	* If maxKeys is null this method will loop through truncated result sets
-	*
-	* @param string $bucket Bucket name
-	* @param string $prefix Prefix
-	* @param string $marker Marker (last file listed)
-	* @param string $maxKeys Max keys (maximum number of keys to return)
-	* @param string $delimiter Delimiter
-	* @param boolean $returnCommonPrefixes Set to true to return CommonPrefixes
-	* @return array | false
-	*/
-	public static function getBucket($bucket, $prefix = null, $marker = null, $maxKeys = null, $delimiter = null, $returnCommonPrefixes = false) {
-		$rest = new S3Request('GET', $bucket, '');
-		if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
-		if ($marker !== null && $marker !== '') $rest->setParameter('marker', $marker);
-		if ($maxKeys !== null && $maxKeys !== '') $rest->setParameter('max-keys', $maxKeys);
-		if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
-		$response = $rest->getResponse();
-		if ($response->error === false && $response->code !== 200)
-			$response->error = array('code' => $response->code, 'message' => 'Unexpected HTTP status');
-		if ($response->error !== false) {
-			trigger_error(sprintf("S3::getBucket(): [%s] %s", $response->error['code'], $response->error['message']), E_USER_WARNING);
-			return false;
-		}
-
-		$results = array();
-
-		$nextMarker = null;
-		if (isset($response->body, $response->body->Contents))
-		foreach ($response->body->Contents as $c) {
-			$results[(string)$c->Key] = array(
-				'name' => (string)$c->Key,
-				'time' => strtotime((string)$c->LastModified),
-				'size' => (int)$c->Size,
-				'hash' => substr((string)$c->ETag, 1, -1)
-			);
-			$nextMarker = (string)$c->Key;
-		}
-
-		if ($returnCommonPrefixes && isset($response->body, $response->body->CommonPrefixes))
-			foreach ($response->body->CommonPrefixes as $c)
-				$results[(string)$c->Prefix] = array('prefix' => (string)$c->Prefix);
-
-		if (isset($response->body, $response->body->IsTruncated) &&
-		(string)$response->body->IsTruncated == 'false') return $results;
-
-		if (isset($response->body, $response->body->NextMarker))
-			$nextMarker = (string)$response->body->NextMarker;
-
-		// Loop through truncated results if maxKeys isn't specified
-		if ($maxKeys == null && $nextMarker !== null && (string)$response->body->IsTruncated == 'true')
-		do {
-			$rest = new S3Request('GET', $bucket, '');
-			if ($prefix !== null && $prefix !== '') $rest->setParameter('prefix', $prefix);
-			$rest->setParameter('marker', $nextMarker);
-			if ($delimiter !== null && $delimiter !== '') $rest->setParameter('delimiter', $delimiter);
-
-			if (($response = $rest->getResponse(true)) == false || $response->code !== 200) break;
-
-			if (isset($response->body, $response->body->Contents))
-			foreach ($response->body->Contents as $c) {
-				$results[(string)$c->Key] = array(
-					'name' => (string)$c->Key,
-					'time' => strtotime((string)$c->LastModified),
-					'size' => (int)$c->Size,
-					'hash' => substr((string)$c->ETag, 1, -1)
-				);
-				$nextMarker = (string)$c->Key;
-			}
-
-			if ($returnCommonPrefixes && isset($response->body, $response->body->CommonPrefixes))
-				foreach ($response->body->CommonPrefixes as $c)
-					$results[(string)$c->Prefix] = array('prefix' => (string)$c->Prefix);
-
-			if (isset($response->body, $response->body->NextMarker))
-				$nextMarker = (string)$response->body->NextMarker;
-
-		} while ($response !== false && (string)$response->body->IsTruncated == 'true');
-
-		return $results;
-	}
-
-
-	/**
-	* Put a bucket
-	*
-	* @param string $bucket Bucket name
-	* @param constant $acl ACL flag
-	* @param string $location Set as "EU" to create buckets hosted in Europe
-	* @return boolean
-	*/
-	public static function putBucket($bucket, $acl = self::ACL_PRIVATE, $location = false) {
-		$rest = new S3Request('PUT', $bucket, '');
-		$rest->setAmzHeader('x-amz-acl', $acl);
-
-		if ($location !== false) {
-			$dom = new DOMDocument;
-			$createBucketConfiguration = $dom->createElement('CreateBucketConfiguration');
-			$locationConstraint = $dom->createElement('LocationConstraint', strtoupper($location));
-			$createBucketConfiguration->appendChild($locationConstraint);
-			$dom->appendChild($createBucketConfiguration);
-			$rest->data = $dom->saveXML();
-			$rest->size = strlen($rest->data);
-			$rest->setHeader('Content-Type', 'application/xml');
-		}
-		$rest = $rest->getResponse();
-
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::putBucket({$bucket}, {$acl}, {$location}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Delete an empty bucket
-	*
-	* @param string $bucket Bucket name
-	* @return boolean
-	*/
-	public static function deleteBucket($bucket) {
-		$rest = new S3Request('DELETE', $bucket);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 204)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteBucket({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Create input info array for putObject()
-	*
-	* @param string $file Input file
-	* @param mixed $md5sum Use MD5 hash (supply a string if you want to use your own)
-	* @return array | false
-	*/
-	public static function inputFile($file, $md5sum = true) {
-		if (!file_exists($file) || !is_file($file) || !is_readable($file)) {
-			trigger_error('S3::inputFile(): Unable to open input file: '.$file, E_USER_WARNING);
-			return false;
-		}
-		return array('file' => $file, 'size' => filesize($file),
-		'md5sum' => $md5sum !== false ? (is_string($md5sum) ? $md5sum :
-		base64_encode(md5_file($file, true))) : '');
-	}
-
-
-	/**
-	* Create input array info for putObject() with a resource
-	*
-	* @param string $resource Input resource to read from
-	* @param integer $bufferSize Input byte size
-	* @param string $md5sum MD5 hash to send (optional)
-	* @return array | false
-	*/
-	public static function inputResource(&$resource, $bufferSize, $md5sum = '') {
-		if (!is_resource($resource) || $bufferSize < 0) {
-			trigger_error('S3::inputResource(): Invalid resource or buffer size', E_USER_WARNING);
-			return false;
-		}
-		$input = array('size' => $bufferSize, 'md5sum' => $md5sum);
-		$input['fp'] =& $resource;
-		return $input;
-	}
-
-
-	/**
-	* Put an object
-	*
-	* @param mixed $input Input data
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param constant $acl ACL constant
-	* @param array $metaHeaders Array of x-amz-meta-* headers
-	* @param array $requestHeaders Array of request headers or content type as a string
-	* @return boolean
-	*/
-	public static function putObject($input, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array()) {
-		if ($input === false) return false;
-		$rest = new S3Request('PUT', $bucket, $uri);
-
-		if (is_string($input)) $input = array(
-			'data' => $input, 'size' => strlen($input),
-			'md5sum' => base64_encode(md5($input, true))
-		);
-
-		// Data
-		if (isset($input['fp']))
-			$rest->fp =& $input['fp'];
-		elseif (isset($input['file']))
-			$rest->fp = @fopen($input['file'], 'rb');
-		elseif (isset($input['data']))
-			$rest->data = $input['data'];
-
-		// Content-Length (required)
-		if (isset($input['size']) && $input['size'] >= 0)
-			$rest->size = $input['size'];
-		else {
-			if (isset($input['file']))
-				$rest->size = filesize($input['file']);
-			elseif (isset($input['data']))
-				$rest->size = strlen($input['data']);
-		}
-
-		// Custom request headers (Content-Type, Content-Disposition, Content-Encoding)
-		if (is_array($requestHeaders))
-			foreach ($requestHeaders as $h => $v) $rest->setHeader($h, $v);
-		elseif (is_string($requestHeaders)) // Support for legacy contentType parameter
-			$input['type'] = $requestHeaders;
-
-		// Content-Type
-		if (!isset($input['type'])) {
-			if (isset($requestHeaders['Content-Type']))
-				$input['type'] =& $requestHeaders['Content-Type'];
-			elseif (isset($input['file']))
-				$input['type'] = self::__getMimeType($input['file']);
-			else
-				$input['type'] = 'application/octet-stream';
-		}
-
-		// We need to post with Content-Length and Content-Type, MD5 is optional
-		if ($rest->size >= 0 && ($rest->fp !== false || $rest->data !== false)) {
-			$rest->setHeader('Content-Type', $input['type']);
-			if (isset($input['md5sum'])) $rest->setHeader('Content-MD5', $input['md5sum']);
-
-			$rest->setAmzHeader('x-amz-acl', $acl);
-			foreach ($metaHeaders as $h => $v) $rest->setAmzHeader('x-amz-meta-'.$h, $v);
-			$rest->getResponse();
-		} else
-			$rest->response->error = array('code' => 0, 'message' => 'Missing input parameters');
-
-		if ($rest->response->error === false && $rest->response->code !== 200)
-			$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->response->error !== false) {
-			trigger_error(sprintf("S3::putObject(): [%s] %s", $rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Put an object from a file (legacy function)
-	*
-	* @param string $file Input file path
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param constant $acl ACL constant
-	* @param array $metaHeaders Array of x-amz-meta-* headers
-	* @param string $contentType Content type
-	* @return boolean
-	*/
-	public static function putObjectFile($file, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = null) {
-		return self::putObject(self::inputFile($file), $bucket, $uri, $acl, $metaHeaders, $contentType);
-	}
-
-
-	/**
-	* Put an object from a string (legacy function)
-	*
-	* @param string $string Input data
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param constant $acl ACL constant
-	* @param array $metaHeaders Array of x-amz-meta-* headers
-	* @param string $contentType Content type
-	* @return boolean
-	*/
-	public static function putObjectString($string, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $contentType = 'text/plain') {
-		return self::putObject($string, $bucket, $uri, $acl, $metaHeaders, $contentType);
-	}
-
-
-	/**
-	* Get an object
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param mixed $saveTo Filename or resource to write to
-	* @return mixed
-	*/
-	public static function getObject($bucket, $uri, $saveTo = false) {
-		$rest = new S3Request('GET', $bucket, $uri);
-		if ($saveTo !== false) {
-			if (is_resource($saveTo))
-				$rest->fp =& $saveTo;
-			else
-				if (($rest->fp = @fopen($saveTo, 'wb')) !== false)
-					$rest->file = realpath($saveTo);
-				else
-					$rest->response->error = array('code' => 0, 'message' => 'Unable to open save file for writing: '.$saveTo);
-		}
-		if ($rest->response->error === false) $rest->getResponse();
-
-		if ($rest->response->error === false && $rest->response->code !== 200)
-			$rest->response->error = array('code' => $rest->response->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->response->error !== false) {
-			trigger_error(sprintf("S3::getObject({$bucket}, {$uri}): [%s] %s",
-			$rest->response->error['code'], $rest->response->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return $rest->response;
-	}
-
-
-	/**
-	* Get object information
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param boolean $returnInfo Return response information
-	* @return mixed | false
-	*/
-	public static function getObjectInfo($bucket, $uri, $returnInfo = true) {
-		$rest = new S3Request('HEAD', $bucket, $uri);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && ($rest->code !== 200 && $rest->code !== 404))
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getObjectInfo({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return $rest->code == 200 ? $returnInfo ? $rest->headers : true : false;
-	}
-
-
-	/**
-	* Copy an object
-	*
-	* @param string $bucket Source bucket name
-	* @param string $uri Source object URI
-	* @param string $bucket Destination bucket name
-	* @param string $uri Destination object URI
-	* @param constant $acl ACL constant
-	* @param array $metaHeaders Optional array of x-amz-meta-* headers
-	* @param array $requestHeaders Optional array of request headers (content type, disposition, etc.)
-	* @return mixed | false
-	*/
-	public static function copyObject($srcBucket, $srcUri, $bucket, $uri, $acl = self::ACL_PRIVATE, $metaHeaders = array(), $requestHeaders = array()) {
-		$rest = new S3Request('PUT', $bucket, $uri);
-		$rest->setHeader('Content-Length', 0);
-		foreach ($requestHeaders as $h => $v) $rest->setHeader($h, $v);
-		foreach ($metaHeaders as $h => $v) $rest->setAmzHeader('x-amz-meta-'.$h, $v);
-		$rest->setAmzHeader('x-amz-acl', $acl);
-		$rest->setAmzHeader('x-amz-copy-source', sprintf('/%s/%s', $srcBucket, $srcUri));
-		if (sizeof($requestHeaders) > 0 || sizeof($metaHeaders) > 0)
-			$rest->setAmzHeader('x-amz-metadata-directive', 'REPLACE');
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::copyObject({$srcBucket}, {$srcUri}, {$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return isset($rest->body->LastModified, $rest->body->ETag) ? array(
-			'time' => strtotime((string)$rest->body->LastModified),
-			'hash' => substr((string)$rest->body->ETag, 1, -1)
-		) : false;
-	}
-
-
-	/**
-	* Set logging for a bucket
-	*
-	* @param string $bucket Bucket name
-	* @param string $targetBucket Target bucket (where logs are stored)
-	* @param string $targetPrefix Log prefix (e,g; domain.com-)
-	* @return boolean
-	*/
-	public static function setBucketLogging($bucket, $targetBucket, $targetPrefix = null) {
-		// The S3 log delivery group has to be added to the target bucket's ACP
-		if ($targetBucket !== null && ($acp = self::getAccessControlPolicy($targetBucket, '')) !== false) {
-			// Only add permissions to the target bucket when they do not exist
-			$aclWriteSet = false;
-			$aclReadSet = false;
-			foreach ($acp['acl'] as $acl)
-			if ($acl['type'] == 'Group' && $acl['uri'] == 'http://acs.amazonaws.com/groups/s3/LogDelivery') {
-				if ($acl['permission'] == 'WRITE') $aclWriteSet = true;
-				elseif ($acl['permission'] == 'READ_ACP') $aclReadSet = true;
-			}
-			if (!$aclWriteSet) $acp['acl'][] = array(
-				'type' => 'Group', 'uri' => 'http://acs.amazonaws.com/groups/s3/LogDelivery', 'permission' => 'WRITE'
-			);
-			if (!$aclReadSet) $acp['acl'][] = array(
-				'type' => 'Group', 'uri' => 'http://acs.amazonaws.com/groups/s3/LogDelivery', 'permission' => 'READ_ACP'
-			);
-			if (!$aclReadSet || !$aclWriteSet) self::setAccessControlPolicy($targetBucket, '', $acp);
-		}
-
-		$dom = new DOMDocument;
-		$bucketLoggingStatus = $dom->createElement('BucketLoggingStatus');
-		$bucketLoggingStatus->setAttribute('xmlns', 'http://s3.amazonaws.com/doc/2006-03-01/');
-		if ($targetBucket !== null) {
-			if ($targetPrefix == null) $targetPrefix = $bucket . '-';
-			$loggingEnabled = $dom->createElement('LoggingEnabled');
-			$loggingEnabled->appendChild($dom->createElement('TargetBucket', $targetBucket));
-			$loggingEnabled->appendChild($dom->createElement('TargetPrefix', $targetPrefix));
-			// TODO: Add TargetGrants?
-			$bucketLoggingStatus->appendChild($loggingEnabled);
-		}
-		$dom->appendChild($bucketLoggingStatus);
-
-		$rest = new S3Request('PUT', $bucket, '');
-		$rest->setParameter('logging', null);
-		$rest->data = $dom->saveXML();
-		$rest->size = strlen($rest->data);
-		$rest->setHeader('Content-Type', 'application/xml');
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::setBucketLogging({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Get logging status for a bucket
-	*
-	* This will return false if logging is not enabled.
-	* Note: To enable logging, you also need to grant write access to the log group
-	*
-	* @param string $bucket Bucket name
-	* @return array | false
-	*/
-	public static function getBucketLogging($bucket) {
-		$rest = new S3Request('GET', $bucket, '');
-		$rest->setParameter('logging', null);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getBucketLogging({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		if (!isset($rest->body->LoggingEnabled)) return false; // No logging
-		return array(
-			'targetBucket' => (string)$rest->body->LoggingEnabled->TargetBucket,
-			'targetPrefix' => (string)$rest->body->LoggingEnabled->TargetPrefix,
-		);
-	}
-
-
-	/**
-	* Disable bucket logging
-	*
-	* @param string $bucket Bucket name
-	* @return boolean
-	*/
-	public static function disableBucketLogging($bucket) {
-		return self::setBucketLogging($bucket, null);
-	}
-
-
-	/**
-	* Get a bucket's location
-	*
-	* @param string $bucket Bucket name
-	* @return string | false
-	*/
-	public static function getBucketLocation($bucket) {
-		$rest = new S3Request('GET', $bucket, '');
-		$rest->setParameter('location', null);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getBucketLocation({$bucket}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return (isset($rest->body[0]) && (string)$rest->body[0] !== '') ? (string)$rest->body[0] : 'US';
-	}
-
-
-	/**
-	* Set object or bucket Access Control Policy
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param array $acp Access Control Policy Data (same as the data returned from getAccessControlPolicy)
-	* @return boolean
-	*/
-	public static function setAccessControlPolicy($bucket, $uri = '', $acp = array()) {
-		$dom = new DOMDocument;
-		$dom->formatOutput = true;
-		$accessControlPolicy = $dom->createElement('AccessControlPolicy');
-		$accessControlList = $dom->createElement('AccessControlList');
-
-		// It seems the owner has to be passed along too
-		$owner = $dom->createElement('Owner');
-		$owner->appendChild($dom->createElement('ID', $acp['owner']['id']));
-		$owner->appendChild($dom->createElement('DisplayName', $acp['owner']['name']));
-		$accessControlPolicy->appendChild($owner);
-
-		foreach ($acp['acl'] as $g) {
-			$grant = $dom->createElement('Grant');
-			$grantee = $dom->createElement('Grantee');
-			$grantee->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-			if (isset($g['id'])) { // CanonicalUser (DisplayName is omitted)
-				$grantee->setAttribute('xsi:type', 'CanonicalUser');
-				$grantee->appendChild($dom->createElement('ID', $g['id']));
-			} elseif (isset($g['email'])) { // AmazonCustomerByEmail
-				$grantee->setAttribute('xsi:type', 'AmazonCustomerByEmail');
-				$grantee->appendChild($dom->createElement('EmailAddress', $g['email']));
-			} elseif ($g['type'] == 'Group') { // Group
-				$grantee->setAttribute('xsi:type', 'Group');
-				$grantee->appendChild($dom->createElement('URI', $g['uri']));
-			}
-			$grant->appendChild($grantee);
-			$grant->appendChild($dom->createElement('Permission', $g['permission']));
-			$accessControlList->appendChild($grant);
-		}
-
-		$accessControlPolicy->appendChild($accessControlList);
-		$dom->appendChild($accessControlPolicy);
-
-		$rest = new S3Request('PUT', $bucket, $uri);
-		$rest->setParameter('acl', null);
-		$rest->data = $dom->saveXML();
-		$rest->size = strlen($rest->data);
-		$rest->setHeader('Content-Type', 'application/xml');
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::setAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Get object or bucket Access Control Policy
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @return mixed | false
-	*/
-	public static function getAccessControlPolicy($bucket, $uri = '') {
-		$rest = new S3Request('GET', $bucket, $uri);
-		$rest->setParameter('acl', null);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getAccessControlPolicy({$bucket}, {$uri}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-
-		$acp = array();
-		if (isset($rest->body->Owner, $rest->body->Owner->ID, $rest->body->Owner->DisplayName)) {
-			$acp['owner'] = array(
-				'id' => (string)$rest->body->Owner->ID, 'name' => (string)$rest->body->Owner->DisplayName
-			);
-		}
-		if (isset($rest->body->AccessControlList)) {
-			$acp['acl'] = array();
-			foreach ($rest->body->AccessControlList->Grant as $grant) {
-				foreach ($grant->Grantee as $grantee) {
-					if (isset($grantee->ID, $grantee->DisplayName)) // CanonicalUser
-						$acp['acl'][] = array(
-							'type' => 'CanonicalUser',
-							'id' => (string)$grantee->ID,
-							'name' => (string)$grantee->DisplayName,
-							'permission' => (string)$grant->Permission
-						);
-					elseif (isset($grantee->EmailAddress)) // AmazonCustomerByEmail
-						$acp['acl'][] = array(
-							'type' => 'AmazonCustomerByEmail',
-							'email' => (string)$grantee->EmailAddress,
-							'permission' => (string)$grant->Permission
-						);
-					elseif (isset($grantee->URI)) // Group
-						$acp['acl'][] = array(
-							'type' => 'Group',
-							'uri' => (string)$grantee->URI,
-							'permission' => (string)$grant->Permission
-						);
-					else continue;
-				}
-			}
-		}
-		return $acp;
-	}
-
-
-	/**
-	* Delete an object
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @return boolean
-	*/
-	public static function deleteObject($bucket, $uri) {
-		$rest = new S3Request('DELETE', $bucket, $uri);
-		$rest = $rest->getResponse();
-		if ($rest->error === false && $rest->code !== 204)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteObject(): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Get a query string authenticated URL
-	*
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @param integer $lifetime Lifetime in seconds
-	* @param boolean $hostBucket Use the bucket name as the hostname
-	* @param boolean $https Use HTTPS ($hostBucket should be false for SSL verification)
-	* @return string
-	*/
-	public static function getAuthenticatedURL($bucket, $uri, $lifetime, $hostBucket = false, $https = false) {
-		$expires = time() + $lifetime;
-		$uri = str_replace('%2F', '/', rawurlencode($uri)); // URI should be encoded (thanks Sean O'Dea)
-		return sprintf(($https ? 'https' : 'http').'://%s/%s?AWSAccessKeyId=%s&Expires=%u&Signature=%s',
-		$hostBucket ? $bucket : $bucket.'.s3.amazonaws.com', $uri, self::$__accessKey, $expires,
-		urlencode(self::__getHash("GET\n\n\n{$expires}\n/{$bucket}/{$uri}")));
-	}
-
-	/**
-	* Get upload POST parameters for form uploads
-	*
-	* @param string $bucket Bucket name
-	* @param string $uriPrefix Object URI prefix
-	* @param constant $acl ACL constant
-	* @param integer $lifetime Lifetime in seconds
-	* @param integer $maxFileSize Maximum filesize in bytes (default 5MB)
-	* @param string $successRedirect Redirect URL or 200 / 201 status code
-	* @param array $amzHeaders Array of x-amz-meta-* headers
-	* @param array $headers Array of request headers or content type as a string
-	* @param boolean $flashVars Includes additional "Filename" variable posted by Flash
-	* @return object
-	*/
-	public static function getHttpUploadPostParams($bucket, $uriPrefix = '', $acl = self::ACL_PRIVATE, $lifetime = 3600, $maxFileSize = 5242880, $successRedirect = "201", $amzHeaders = array(), $headers = array(), $flashVars = false) {
-		// Create policy object
-		$policy = new stdClass;
-		$policy->expiration = gmdate('Y-m-d\TH:i:s\Z', (time() + $lifetime));
-		$policy->conditions = array();
-		$obj = new stdClass; $obj->bucket = $bucket; array_push($policy->conditions, $obj);
-		$obj = new stdClass; $obj->acl = $acl; array_push($policy->conditions, $obj);
-
-		$obj = new stdClass; // 200 for non-redirect uploads
-		if (is_numeric($successRedirect) && in_array((int)$successRedirect, array(200, 201)))
-			$obj->success_action_status = (string)$successRedirect;
-		else // URL
-			$obj->success_action_redirect = $successRedirect;
-		array_push($policy->conditions, $obj);
-
-		array_push($policy->conditions, array('starts-with', '$key', $uriPrefix));
-		if ($flashVars) array_push($policy->conditions, array('starts-with', '$Filename', ''));
-		foreach (array_keys($headers) as $headerKey)
-			array_push($policy->conditions, array('starts-with', '$'.$headerKey, ''));
-		foreach ($amzHeaders as $headerKey => $headerVal) {
-			$obj = new stdClass; $obj->{$headerKey} = (string)$headerVal; array_push($policy->conditions, $obj);
-		}
-		array_push($policy->conditions, array('content-length-range', 0, $maxFileSize));
-		$policy = base64_encode(str_replace('\/', '/', json_encode($policy)));
-	
-		// Create parameters
-		$params = new stdClass;
-		$params->AWSAccessKeyId = self::$__accessKey;
-		$params->key = $uriPrefix.'${filename}';
-		$params->acl = $acl;
-		$params->policy = $policy; unset($policy);
-		$params->signature = self::__getHash($params->policy);
-		if (is_numeric($successRedirect) && in_array((int)$successRedirect, array(200, 201)))
-			$params->success_action_status = (string)$successRedirect;
-		else
-			$params->success_action_redirect = $successRedirect;
-		foreach ($headers as $headerKey => $headerVal) $params->{$headerKey} = (string)$headerVal;
-		foreach ($amzHeaders as $headerKey => $headerVal) $params->{$headerKey} = (string)$headerVal;
-		return $params;
-	}
-
-	/**
-	* Create a CloudFront distribution
-	*
-	* @param string $bucket Bucket name
-	* @param boolean $enabled Enabled (true/false)
-	* @param array $cnames Array containing CNAME aliases
-	* @param string $comment Use the bucket name as the hostname
-	* @return array | false
-	*/
-	public static function createDistribution($bucket, $enabled = true, $cnames = array(), $comment = '') {
-		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('POST', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
-		$rest->data = self::__getCloudFrontDistributionConfigXML($bucket.'.s3.amazonaws.com', $enabled, $comment, (string)microtime(true), $cnames);
-		$rest->size = strlen($rest->data);
-		$rest->setHeader('Content-Type', 'application/xml');
-		$rest = self::__getCloudFrontResponse($rest);
-
-		if ($rest->error === false && $rest->code !== 201)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::createDistribution({$bucket}, ".(int)$enabled.", '$comment'): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		} elseif ($rest->body instanceof SimpleXMLElement)
-			return self::__parseCloudFrontDistributionConfig($rest->body);
-		return false;
-	}
-
-
-	/**
-	* Get CloudFront distribution info
-	*
-	* @param string $distributionId Distribution ID from listDistributions()
-	* @return array | false
-	*/
-	public static function getDistribution($distributionId) {
-		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('GET', '', '2008-06-30/distribution/'.$distributionId, 'cloudfront.amazonaws.com');
-		$rest = self::__getCloudFrontResponse($rest);
-
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::getDistribution($distributionId): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		} elseif ($rest->body instanceof SimpleXMLElement) {
-			$dist = self::__parseCloudFrontDistributionConfig($rest->body);
-			$dist['hash'] = $rest->headers['hash'];
-			return $dist;
-		}
-		return false;
-	}
-
-
-	/**
-	* Update a CloudFront distribution
-	*
-	* @param array $dist Distribution array info identical to output of getDistribution()
-	* @return array | false
-	*/
-	public static function updateDistribution($dist) {
-		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('PUT', '', '2008-06-30/distribution/'.$dist['id'].'/config', 'cloudfront.amazonaws.com');
-		$rest->data = self::__getCloudFrontDistributionConfigXML($dist['origin'], $dist['enabled'], $dist['comment'], $dist['callerReference'], $dist['cnames']);
-		$rest->size = strlen($rest->data);
-		$rest->setHeader('If-Match', $dist['hash']);
-		$rest = self::__getCloudFrontResponse($rest);
-
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::updateDistribution({$dist['id']}, ".(int)$enabled.", '$comment'): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		} else {
-			$dist = self::__parseCloudFrontDistributionConfig($rest->body);
-			$dist['hash'] = $rest->headers['hash'];
-			return $dist;
-		}
-		return false;
-	}
-
-
-	/**
-	* Delete a CloudFront distribution
-	*
-	* @param array $dist Distribution array info identical to output of getDistribution()
-	* @return boolean
-	*/
-	public static function deleteDistribution($dist) {
-		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('DELETE', '', '2008-06-30/distribution/'.$dist['id'], 'cloudfront.amazonaws.com');
-		$rest->setHeader('If-Match', $dist['hash']);
-		$rest = self::__getCloudFrontResponse($rest);
-
-		if ($rest->error === false && $rest->code !== 204)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::deleteDistribution({$dist['id']}): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	* Get a list of CloudFront distributions
-	*
-	* @return array
-	*/
-	public static function listDistributions() {
-		self::$useSSL = true; // CloudFront requires SSL
-		$rest = new S3Request('GET', '', '2008-06-30/distribution', 'cloudfront.amazonaws.com');
-		$rest = self::__getCloudFrontResponse($rest);
-
-		if ($rest->error === false && $rest->code !== 200)
-			$rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status');
-		if ($rest->error !== false) {
-			trigger_error(sprintf("S3::listDistributions(): [%s] %s",
-			$rest->error['code'], $rest->error['message']), E_USER_WARNING);
-			return false;
-		} elseif ($rest->body instanceof SimpleXMLElement && isset($rest->body->DistributionSummary)) {
-			$list = array();
-			if (isset($rest->body->Marker, $rest->body->MaxItems, $rest->body->IsTruncated)) {
-				//$info['marker'] = (string)$rest->body->Marker;
-				//$info['maxItems'] = (int)$rest->body->MaxItems;
-				//$info['isTruncated'] = (string)$rest->body->IsTruncated == 'true' ? true : false;
-			}
-			foreach ($rest->body->DistributionSummary as $summary) {
-				$list[(string)$summary->Id] = self::__parseCloudFrontDistributionConfig($summary);
-			}
-			return $list;
-		}
-		return array();
-	}
-
-
-	/**
-	* Get a DistributionConfig DOMDocument
-	*
-	* @internal Used to create XML in createDistribution() and updateDistribution()
-	* @param string $bucket Origin bucket
-	* @param boolean $enabled Enabled (true/false)
-	* @param string $comment Comment to append
-	* @param string $callerReference Caller reference
-	* @param array $cnames Array of CNAME aliases
-	* @return string
-	*/
-	private static function __getCloudFrontDistributionConfigXML($bucket, $enabled, $comment, $callerReference = '0', $cnames = array()) {
-		$dom = new DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$distributionConfig = $dom->createElement('DistributionConfig');
-		$distributionConfig->setAttribute('xmlns', 'http://cloudfront.amazonaws.com/doc/2008-06-30/');
-		$distributionConfig->appendChild($dom->createElement('Origin', $bucket));
-		$distributionConfig->appendChild($dom->createElement('CallerReference', $callerReference));
-		foreach ($cnames as $cname)
-			$distributionConfig->appendChild($dom->createElement('CNAME', $cname));
-		if ($comment !== '') $distributionConfig->appendChild($dom->createElement('Comment', $comment));
-		$distributionConfig->appendChild($dom->createElement('Enabled', $enabled ? 'true' : 'false'));
-		$dom->appendChild($distributionConfig);
-		return $dom->saveXML();
-	}
-
-
-	/**
-	* Parse a CloudFront distribution config
-	*
-	* @internal Used to parse the CloudFront DistributionConfig node to an array
-	* @param object &$node DOMNode
-	* @return array
-	*/
-	private static function __parseCloudFrontDistributionConfig(&$node) {
-		$dist = array();
-		if (isset($node->Id, $node->Status, $node->LastModifiedTime, $node->DomainName)) {
-			$dist['id'] = (string)$node->Id;
-			$dist['status'] = (string)$node->Status;
-			$dist['time'] = strtotime((string)$node->LastModifiedTime);
-			$dist['domain'] = (string)$node->DomainName;
-		}
-		if (isset($node->CallerReference))
-			$dist['callerReference'] = (string)$node->CallerReference;
-		if (isset($node->Comment))
-			$dist['comment'] = (string)$node->Comment;
-		if (isset($node->Enabled, $node->Origin)) {
-			$dist['origin'] = (string)$node->Origin;
-			$dist['enabled'] = (string)$node->Enabled == 'true' ? true : false;
-		} elseif (isset($node->DistributionConfig)) {
-			$dist = array_merge($dist, self::__parseCloudFrontDistributionConfig($node->DistributionConfig));
-		}
-		if (isset($node->CNAME)) {
-			$dist['cnames'] = array();
-			foreach ($node->CNAME as $cname) $dist['cnames'][(string)$cname] = (string)$cname;
-		}
-		return $dist;
-	}
-
-
-	/**
-	* Grab CloudFront response
-	*
-	* @internal Used to parse the CloudFront S3Request::getResponse() output
-	* @param object &$rest S3Request instance
-	* @return object
-	*/
-	private static function __getCloudFrontResponse(&$rest) {
-		$rest->getResponse();
-		if ($rest->response->error === false && isset($rest->response->body) &&
-		is_string($rest->response->body) && substr($rest->response->body, 0, 5) == '<?xml') {
-			$rest->response->body = simplexml_load_string($rest->response->body);
-			// Grab CloudFront errors
-			if (isset($rest->response->body->Error, $rest->response->body->Error->Code,
-			$rest->response->body->Error->Message)) {
-				$rest->response->error = array(
-					'code' => (string)$rest->response->body->Error->Code,
-					'message' => (string)$rest->response->body->Error->Message
-				);
-				unset($rest->response->body);
-			}
-		}
-		return $rest->response;
-	}
-
-
-	/**
-	* Get MIME type for file
-	*
-	* @internal Used to get mime types
-	* @param string &$file File path
-	* @return string
-	*/
-	public static function __getMimeType(&$file) {
-		$type = false;
-		// Fileinfo documentation says fileinfo_open() will use the
-		// MAGIC env var for the magic file
-		if (extension_loaded('fileinfo') && isset($_ENV['MAGIC']) &&
-		($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false) {
-			if (($type = finfo_file($finfo, $file)) !== false) {
-				// Remove the charset and grab the last content-type
-				$type = explode(' ', str_replace('; charset=', ';charset=', $type));
-				$type = array_pop($type);
-				$type = explode(';', $type);
-				$type = trim(array_shift($type));
-			}
-			finfo_close($finfo);
-
-		// If anyone is still using mime_content_type()
-		} elseif (function_exists('mime_content_type'))
-			$type = trim(mime_content_type($file));
-
-		if ($type !== false && strlen($type) > 0) return $type;
-
-		// Otherwise do it the old fashioned way
-		static $exts = array(
-			'jpg' => 'image/jpeg', 'gif' => 'image/gif', 'png' => 'image/png',
-			'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'ico' => 'image/x-icon',
-			'swf' => 'application/x-shockwave-flash', 'pdf' => 'application/pdf',
-			'zip' => 'application/zip', 'gz' => 'application/x-gzip',
-			'tar' => 'application/x-tar', 'bz' => 'application/x-bzip',
-			'bz2' => 'application/x-bzip2', 'txt' => 'text/plain',
-			'asc' => 'text/plain', 'htm' => 'text/html', 'html' => 'text/html',
-			'css' => 'text/css', 'js' => 'text/javascript',
-			'xml' => 'text/xml', 'xsl' => 'application/xsl+xml',
-			'ogg' => 'application/ogg', 'mp3' => 'audio/mpeg', 'wav' => 'audio/x-wav',
-			'avi' => 'video/x-msvideo', 'mpg' => 'video/mpeg', 'mpeg' => 'video/mpeg',
-			'mov' => 'video/quicktime', 'flv' => 'video/x-flv', 'php' => 'text/x-php'
-		);
-		$ext = strtolower(pathInfo($file, PATHINFO_EXTENSION));
-		return isset($exts[$ext]) ? $exts[$ext] : 'application/octet-stream';
-	}
-
-
-	/**
-	* Generate the auth string: "AWS AccessKey:Signature"
-	*
-	* @internal Used by S3Request::getResponse()
-	* @param string $string String to sign
-	* @return string
-	*/
-	public static function __getSignature($string) {
-		return 'AWS '.self::$__accessKey.':'.self::__getHash($string);
-	}
-
-
-	/**
-	* Creates a HMAC-SHA1 hash
-	*
-	* This uses the hash extension if loaded
-	*
-	* @internal Used by __getSignature()
-	* @param string $string String to sign
-	* @return string
-	*/
-	private static function __getHash($string) {
-		return base64_encode(extension_loaded('hash') ?
-		hash_hmac('sha1', $string, self::$__secretKey, true) : pack('H*', sha1(
-		(str_pad(self::$__secretKey, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
-		pack('H*', sha1((str_pad(self::$__secretKey, 64, chr(0x00)) ^
-		(str_repeat(chr(0x36), 64))) . $string)))));
-	}
-
-}
-
-final class S3Request {
-	private $verb, $bucket, $uri, $resource = '', $parameters = array(),
-	$amzHeaders = array(), $headers = array(
-		'Host' => '', 'Date' => '', 'Content-MD5' => '', 'Content-Type' => ''
-	);
-	public $fp = false, $size = 0, $data = false, $response;
-
-
-	/**
-	* Constructor
-	*
-	* @param string $verb Verb
-	* @param string $bucket Bucket name
-	* @param string $uri Object URI
-	* @return mixed
-	*/
-	function __construct($verb, $bucket = '', $uri = '', $defaultHost = 's3.amazonaws.com') {
-		$this->verb = $verb;
-		$this->bucket = strtolower($bucket);
-		$this->uri = $uri !== '' ? '/'.str_replace('%2F', '/', rawurlencode($uri)) : '/';
-
-		if ($this->bucket !== '') {
-			$this->headers['Host'] = $this->bucket.'.'.$defaultHost;
-			$this->resource = '/'.$this->bucket.$this->uri;
-		} else {
-			$this->headers['Host'] = $defaultHost;
-			//$this->resource = strlen($this->uri) > 1 ? '/'.$this->bucket.$this->uri : $this->uri;
-			$this->resource = $this->uri;
-		}
-		$this->headers['Date'] = gmdate('D, d M Y H:i:s T');
-
-		$this->response = new STDClass;
-		$this->response->error = false;
-	}
-
-
-	/**
-	* Set request parameter
-	*
-	* @param string $key Key
-	* @param string $value Value
-	* @return void
-	*/
-	public function setParameter($key, $value) {
-		$this->parameters[$key] = $value;
-	}
-
-
-	/**
-	* Set request header
-	*
-	* @param string $key Key
-	* @param string $value Value
-	* @return void
-	*/
-	public function setHeader($key, $value) {
-		$this->headers[$key] = $value;
-	}
-
-
-	/**
-	* Set x-amz-meta-* header
-	*
-	* @param string $key Key
-	* @param string $value Value
-	* @return void
-	*/
-	public function setAmzHeader($key, $value) {
-		$this->amzHeaders[$key] = $value;
-	}
-
-
-	/**
-	* Get the S3 response
-	*
-	* @return object | false
-	*/
-	public function getResponse() {
-		$query = '';
-		if (sizeof($this->parameters) > 0) {
-			$query = substr($this->uri, -1) !== '?' ? '?' : '&';
-			foreach ($this->parameters as $var => $value)
-				if ($value == null || $value == '') $query .= $var.'&';
-				// Parameters should be encoded (thanks Sean O'Dea)
-				else $query .= $var.'='.rawurlencode($value).'&';
-			$query = substr($query, 0, -1);
-			$this->uri .= $query;
-
-			if (array_key_exists('acl', $this->parameters) ||
-			array_key_exists('location', $this->parameters) ||
-			array_key_exists('torrent', $this->parameters) ||
-			array_key_exists('logging', $this->parameters))
-				$this->resource .= $query;
-		}
-		$url = ((S3::$useSSL && extension_loaded('openssl')) ?
-		'https://':'http://').$this->headers['Host'].$this->uri;
-		//var_dump($this->bucket, $this->uri, $this->resource, $url);
-
-		// Basic setup
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_USERAGENT, 'S3/php');
-
-		if (S3::$useSSL) {
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 1);
-		}
-
-		curl_setopt($curl, CURLOPT_URL, $url);
-
-		// Headers
-		$headers = array(); $amz = array();
-		foreach ($this->amzHeaders as $header => $value)
-			if (strlen($value) > 0) $headers[] = $header.': '.$value;
-		foreach ($this->headers as $header => $value)
-			if (strlen($value) > 0) $headers[] = $header.': '.$value;
-
-		// Collect AMZ headers for signature
-		foreach ($this->amzHeaders as $header => $value)
-			if (strlen($value) > 0) $amz[] = strtolower($header).':'.$value;
-
-		// AMZ headers must be sorted
-		if (sizeof($amz) > 0) {
-			sort($amz);
-			$amz = "\n".implode("\n", $amz);
-		} else $amz = '';
-
-		// Authorization string (CloudFront stringToSign should only contain a date)
-		$headers[] = 'Authorization: ' . S3::__getSignature(
-			$this->headers['Host'] == 'cloudfront.amazonaws.com' ? $this->headers['Date'] :
-			$this->verb."\n".$this->headers['Content-MD5']."\n".
-			$this->headers['Content-Type']."\n".$this->headers['Date'].$amz."\n".$this->resource
-		);
-
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($curl, CURLOPT_HEADER, false);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, false);
-		curl_setopt($curl, CURLOPT_WRITEFUNCTION, array(&$this, '__responseWriteCallback'));
-		curl_setopt($curl, CURLOPT_HEADERFUNCTION, array(&$this, '__responseHeaderCallback'));
-		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-
-		// Request types
-		switch ($this->verb) {
-			case 'GET': break;
-			case 'PUT': case 'POST': // POST only used for CloudFront
-				if ($this->fp !== false) {
-					curl_setopt($curl, CURLOPT_PUT, true);
-					curl_setopt($curl, CURLOPT_INFILE, $this->fp);
-					if ($this->size >= 0)
-						curl_setopt($curl, CURLOPT_INFILESIZE, $this->size);
-				} elseif ($this->data !== false) {
-					curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
-					curl_setopt($curl, CURLOPT_POSTFIELDS, $this->data);
-					if ($this->size >= 0)
-						curl_setopt($curl, CURLOPT_BUFFERSIZE, $this->size);
-				} else
-					curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
-			break;
-			case 'HEAD':
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'HEAD');
-				curl_setopt($curl, CURLOPT_NOBODY, true);
-			break;
-			case 'DELETE':
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
-			break;
-			default: break;
-		}
-
-		// Execute, grab errors
-		if (curl_exec($curl))
-			$this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		else
-			$this->response->error = array(
-				'code' => curl_errno($curl),
-				'message' => curl_error($curl),
-				'resource' => $this->resource
-			);
-
-		@curl_close($curl);
-
-		// Parse body into XML
-		if ($this->response->error === false && isset($this->response->headers['type']) &&
-		$this->response->headers['type'] == 'application/xml' && isset($this->response->body)) {
-			$this->response->body = simplexml_load_string($this->response->body);
-
-			// Grab S3 errors
-			if (!in_array($this->response->code, array(200, 204)) &&
-			isset($this->response->body->Code, $this->response->body->Message)) {
-				$this->response->error = array(
-					'code' => (string)$this->response->body->Code,
-					'message' => (string)$this->response->body->Message
-				);
-				if (isset($this->response->body->Resource))
-					$this->response->error['resource'] = (string)$this->response->body->Resource;
-				unset($this->response->body);
-			}
-		}
-
-		// Clean up file resources
-		if ($this->fp !== false && is_resource($this->fp)) fclose($this->fp);
-
-		return $this->response;
-	}
-
-
-	/**
-	* CURL write callback
-	*
-	* @param resource &$curl CURL resource
-	* @param string &$data Data
-	* @return integer
-	*/
-	private function __responseWriteCallback(&$curl, &$data) {
-		if ($this->response->code == 200 && $this->fp !== false)
-			return fwrite($this->fp, $data);
-		else
-			$this->response->body .= $data;
-		return strlen($data);
-	}
-
-
-	/**
-	* CURL header callback
-	*
-	* @param resource &$curl CURL resource
-	* @param string &$data Data
-	* @return integer
-	*/
-	private function __responseHeaderCallback(&$curl, &$data) {
-		if (($strlen = strlen($data)) <= 2) return $strlen;
-		if (substr($data, 0, 4) == 'HTTP')
-			$this->response->code = (int)substr($data, 9, 3);
-		else {
-			list($header, $value) = explode(': ', trim($data), 2);
-			if ($header == 'Last-Modified')
-				$this->response->headers['time'] = strtotime($value);
-			elseif ($header == 'Content-Length')
-				$this->response->headers['size'] = (int)$value;
-			elseif ($header == 'Content-Type')
-				$this->response->headers['type'] = $value;
-			elseif ($header == 'ETag')
-				$this->response->headers['hash'] = $value{0} == '"' ? substr($value, 1, -1) : $value;
-			elseif (preg_match('/^x-amz-meta-.*$/', $header))
-				$this->response->headers[$header] = is_numeric($value) ? (int)$value : $value;
-		}
-		return $strlen;
-	}
-
-}
diff --git a/modules/video_s3/includes/amazon_s3.inc b/modules/video_s3/includes/amazon_s3.inc
deleted file mode 100644
index db25032..0000000
--- a/modules/video_s3/includes/amazon_s3.inc
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-/*
- * @file
- * Class file to handle amazon s3 transfers.
- *
- */
-
-// Include our class file.
-if (!class_exists('S3'))
-  require_once('S3.php');
-
-define('VIDEO_S3_PENDING', 1);
-define('VIDEO_S3_ACTIVE', 5);
-define('VIDEO_S3_COMPLETE', 10);
-define('VIDEO_S3_FAILED', 20);
-
-class video_amazon_s3 {
-
-  private $access_key;
-  private $secret_key;
-  private $ssl;
-  private $limit;
-  private $bucket;
-  public $s3;
-
-  public function __construct() {
-    $this->access_key = variable_get('amazon_s3_access_key', '');
-    $this->secret_key = variable_get('amazon_s3_secret_access_key', '');
-    $this->ssl = variable_get('amazon_s3_ssl', FALSE);
-    $this->limit = variable_get('amazon_s3_limit', 5);
-    $this->bucket = variable_get('amazon_s3_bucket', '');
-  }
-
-  public function connect($access_key = '', $secret_key = '', $ssl = FALSE) {
-    $access_key = $access_key ? $access_key : $this->access_key;
-    $secret_key = $secret_key ? $secret_key : $this->secret_key;
-    $ssl = $ssl ? $ssl : $this->ssl;
-    // Make our connection to Amazon.
-    $this->s3 = new S3($access_key, $secret_key, $ssl);
-  }
-
-  /*
-   * Verifies the existence of a file id, returns the row or false if none found.
-   */
-
-  public function verify($fid) {
-    $sql = db_query("SELECT * FROM {video_s3} WHERE fid=%d", $fid);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  /*
-   * Gets a video object from the database.
-   */
-
-  public function get($fid) {
-    $sql = db_query("SELECT * FROM {video_s3} WHERE fid=%d AND status=%d", $fid, VIDEO_S3_COMPLETE);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  /*
-   * Inserts file object into the database.
-   */
-
-  public function insert($fid) {
-    db_query("INSERT INTO {video_s3} (fid, status) VALUES (%d, %d)", $fid, VIDEO_S3_PENDING);
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-   */
-
-  public function update($video) {
-    $result = db_query("UPDATE {video_s3} SET bucket='%s', filename='%s', filepath='%s', filemime='%s', filesize='%s', status=%d, completed=%d WHERE vid=%d",
-            $video->bucket, $video->filename, $video->filepath, $video->filemime, $video->filesize, VIDEO_S3_COMPLETE, time(), $video->vid);
-    return $result;
-  }
-
-  public function working($vid) {
-    db_query("UPDATE {video_s3} SET status=%d WHERE vid=%d", VIDEO_S3_ACTIVE, $vid);
-  }
-
-  public function failed($vid) {
-    db_query("UPDATE {video_s3} SET status=%d WHERE vid=%d", VIDEO_S3_FAILED, $vid);
-  }
-
-  public function delete($fid) {
-    // Lets get our file no matter the status and delete it.
-    if ($video = $this->verify($fid)) {
-      if ($video->bucket) {
-        // It has been pushed to amazon so lets remove it.
-        $this->s3->deleteObject($video->bucket, $video->filename);
-      }
-      // Lets delete our record from the database.
-      db_query("DELETE FROM {video_s3} WHERE vid=%d", $video->vid);
-    }
-  }
-
-  /*
-   * Selects the pending queue to be transfered to amazon.
-   */
-
-  public function queue() {
-    $video = false;
-    $sql = db_query("SELECT vid, fid FROM {video_s3} WHERE status=%d LIMIT %d", VIDEO_S3_PENDING, $this->limit);
-    while ($row = db_fetch_object($sql)) {
-      $video = false;
-      // We need to check if this file id exists in our transcoding table.
-      $sql_video = db_query("SELECT * FROM {video_files} WHERE fid=%d", $row->fid);
-      if ($sql_video_row = db_fetch_object($sql_video)) {
-        // This is a transcoded file, lets verify it has been transcoded and if so lets push it to amazon.
-        module_load_include('inc', 'video', '/includes/conversion');
-        if ($sql_video_row->status == VIDEO_RENDERING_COMPLETE) {
-          $video = $sql_video_row;
-        }
-      } else {
-        // This is a regular video file, lets get our file object from the files table and push it to amazon.
-        $sql_files = db_query("SELECT * FROM {files} WHERE fid=%d", $row->fid);
-        if ($sql_files_row = db_fetch_object($sql_files)) {
-          $video = $sql_files_row;
-        }
-      }
-      // If we have a video lets go ahead and send it.
-      if ($video) {
-        // Update our status to working.
-        $this->working($row->vid);
-        $filepath = $video->filepath;
-        // get the folder path as file object
-        $filename = $video->filepath;
-        // use the file object as file name
-        $video->filename = $filename;
-        $perm = (variable_get('amazon_s3_private', FALSE) == FALSE) ? S3::ACL_PUBLIC_READ : S3::ACL_PRIVATE;
-
-        if ($this->s3->putObjectFile($filepath, $this->bucket, $filename, $perm)) {
-          // Update our table.
-          $video->bucket = $this->bucket;
-          $video->vid = $row->vid;
-          $prefix = $this->ssl ? 'https://' : 'http://';
-          $video->filepath = $prefix . $video->bucket . '.s3.amazonaws.com/' . $filename;
-          if ($this->update($video)) {
-            watchdog('amazon_s3', t('Successfully uploaded our file: !file into the bucket %bucket on the Amazon S3 server.', array('!file' => $filepath, '%bucket' => $this->bucket)), array(), WATCHDOG_INFO);
-          }
-        } else {
-          watchdog('amazon_s3', 'Failed to upload our file to the amazon s3 server.', array(), WATCHDOG_ERROR);
-          $this->failed($row->vid);
-        }
-      } else {
-        watchdog('amazon_s3', 'We did not find the file id: ' . $row->fid . ' or it is still queued for ffmpeg processing.', array(), WATCHDOG_DEBUG);
-      }
-    }
-  }
-
-  public function get_object_info($object) {
-    return $this->s3->getObjectInfo($this->bucket, $object);
-  }
-
-  public function get_authenticated_url($object) {
-    $lifetime = variable_get('amazon_s3_lifetime', '1800');
-    return $this->s3->getAuthenticatedURL($this->bucket, $object, $lifetime);
-  }
-
-  public function get_object($object, $saveTo = false) {
-    return $this->s3->getObject($this->bucket, $object, $saveTo);
-  }
-
-}
\ No newline at end of file
diff --git a/modules/video_s3/video_s3.info b/modules/video_s3/video_s3.info
deleted file mode 100644
index 61a2c71..0000000
--- a/modules/video_s3/video_s3.info
+++ /dev/null
@@ -1,6 +0,0 @@
-
-name = Amazon S3 on Video
-description = Leverages the Video module and Amazon Simple Storage Service (Amazon S3) to serve and store your video's saving bandwidth.
-package = Video
-core = 7.x
-dependencies[] = video
diff --git a/modules/video_s3/video_s3.install b/modules/video_s3/video_s3.install
deleted file mode 100644
index 7719070..0000000
--- a/modules/video_s3/video_s3.install
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * @file
- * Provides installation functions for video_s3.module.
- */
-
-/**
- * Implementation of hook_schema().
- */
-function video_s3_schema() {
-  $schema['video_s3'] = array(
-    'description' => t('Store video s3 cdn'),
-    'fields' => array(
-  	  'vid' => array(
-        'description' => t('Auto Increment id'),
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'fid' => array(
-        'description' => t('Original file id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'nid' => array(
-        'description' => t('Node id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'bucket' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The bucket the video is stored in.'),
-      ),
-	  'filename' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filename of the video.'),
-      ),
-	  'filepath' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filepath of the video.'),
-      ),
-	  'filemime' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The filemime of the video.'),
-      ),
-      'filesize' => array(
-        'description' => t('Filesize of the video.'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'status' => array(
-        'description' => t('Status of the cdn transfer'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'completed' => array(
-        'description' => t('Time of successful completion to amazon.'),
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-    ),
-    'indexes' => array(
-      'status' => array('status'),
-      'file' => array('fid'),
-    ),
-    'primary key' => array('vid'),
-  );
-  return $schema;
-}
-
-/**
- * Implementation of hook_install().
- */
-function video_s3_install() {
-  drupal_install_schema('video_s3');
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function video_s3_uninstall() {
-  drupal_uninstall_schema('video_s3');
-  // Delete our variables.
-  variable_del('amazon_s3');
-  variable_del('amazon_s3_ssl');
-  variable_del('amazon_s3_access_key');
-  variable_del('amazon_s3_secret_access_key');
-  variable_del('amazon_s3_bucket');
-}
diff --git a/modules/video_s3/video_s3.module b/modules/video_s3/video_s3.module
deleted file mode 100644
index 5762fef..0000000
--- a/modules/video_s3/video_s3.module
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides wrapper functions for the s3 amazon webservices.
- */
-/*
- * Implementation of hook_perm().
- */
-function video_s3_perm() {
-  return array('administer amazon s3');
-}
-
-/*
- * Implmentation of hook_help().
- */
-
-function video_s3_help($path, $arg) {
-  switch ($path) {
-    case 'admin/settings/video/amazon_s3':
-      $output = t('Use Amazon Simple Storage Service (Amazon S3) to store your video files.  This free\'s up bandwidth from your site, providing a faster experience for your users.  Simply enable this module and enter your authentication details and your done!');
-      return $output;
-  }
-}
-
-/*
- * Implementation of hook_menu().
- */
-
-function video_s3_menu() {
-  $items = array();
-  $items['admin/settings/video/amazon_s3/bucket/%/delete'] = array(
-    'title' => 'Delete Bucket',
-    'page callback' => 'video_s3_bucket_delete',
-    'page arguments' => array(5),
-    'access arguments' => array('administer amazon s3'),
-    'file' => 'video_s3.admin.inc',
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
-}
-
-/*
- * Implementation of hook_cron().
- */
-
-function video_s3_cron() {
-  $filesystem = variable_get('video_filesystem', 'drupal');
-  if ($filesystem == 'video_s3') {
-    module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-    $s3 = new video_amazon_s3;
-    $s3->connect();
-    // Lets run our queue.
-    $s3->queue();
-  }
-}
-
-/**
- * Implementation of hook_video_delete.
- * we can use hook_file_delete()
- */
-function video_s3_video_delete($file) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  $s3->connect();
-  // Lets run our queue.
-  $s3->delete($file->fid);
-}
-
-/*
- * Implementation of hook_video_update.
- * Submit hanlder to update our s3 table to include the node id.
- */
-
-function video_s3_video_update($form, &$form_state) {
-  //lets update our video rending table to include the node id created
-  if (isset($form_state['nid']) && isset($form_state['values']['video_id']) && is_array($form_state['values']['video_id'])) {
-    foreach ($form_state['values']['video_id'] as $fid) {
-      //lets update our table to include the nid
-      db_query("UPDATE {video_s3} SET nid=%d WHERE fid=%d", $form_state['nid'], $fid);
-    }
-  }
-}
-
-/**
- * Implementing hook_video_insert
- * @param <type> $element
- * @param <type> $form_state
- */
-function video_s3_video_insert(&$element, &$form_state) {
-  $file = $element['#value'];
-  //we need to check if this fid has already been added to the database AND that there is in fact a fid
-  if (is_array($file) && isset($file['fid']) && !empty($file['fid'])) {
-    module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-    $s3 = new video_amazon_s3;
-    $s3->connect();
-    // Lets verify that we haven't added this video already.  Multiple validation fails will cause this to be ran more than once
-    if (!$video = $s3->verify($file['fid'])) {
-      // Video has not been added to the queue yet so lets add it.
-      $s3->insert($file['fid']);
-      drupal_set_message(t('Video submission queued for transfer to your Amazon S3 server. Will be there shortly.'));
-    }
-  }
-}
-
-/**
- * Implementing hook_video_load
- * @param <type> $element
- * @param <type> $form_state
- */
-function video_s3_video_load(&$video) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  if ($amazon = $s3->get($video->fid)) {
-    // Fix our filepath
-    $video->filepath = $amazon->filepath;
-//    $video->url = $amazon->filepath;
-    if (variable_get('amazon_s3_private', FALSE))
-      $video->files->{$video->player}->url = video_s3_get_authenticated_url($amazon->filename);
-    else
-      $video->files->{$video->player}->url = $amazon->filepath;
-
-    $video->extension = pathinfo($amazon->filepath, PATHINFO_EXTENSION);
-  }
-}
-
-function video_s3_get_object_info($object) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  $s3->connect();
-  return $s3->get_object_info($object);
-}
-
-function video_s3_get_authenticated_url($object) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  $s3->connect();
-  return $s3->get_authenticated_url($object);
-}
-
-function video_s3_get_object($object, $save_to = false) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  $s3->connect();
-  return $s3->get_object($object, $save_to);
-}
-
-/*
- * Deletes a bucket from your Amazon S3 server.
- */
-
-function video_s3_bucket_delete($bucket) {
-  module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-  $s3 = new video_amazon_s3;
-  $s3->connect();
-  $buckets = $s3->s3->listBuckets();
-  if (is_array($buckets) && in_array($bucket, $buckets)) {
-    if ($s3->s3->deleteBucket($bucket)) {
-      drupal_set_message(t('Successfully deleted the bucket %bucket', array('%bucket' => $bucket)));
-    } else {
-      drupal_set_message(t('Could not delete the bucket %bucket', array('%bucket' => $bucket)), 'error');
-    }
-  } else {
-    drupal_set_message(t('The bucket %bucket does not exist for deletion.', array('%bucket' => $bucket)), 'error');
-  }
-  drupal_goto('admin/settings/video/amazon_s3');
-}
\ No newline at end of file
diff --git a/modules/video_zencoder/includes/LICENSE b/modules/video_zencoder/includes/LICENSE
deleted file mode 100644
index d1f0a51..0000000
--- a/modules/video_zencoder/includes/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Zencoder
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/modules/video_zencoder/includes/README.markdown b/modules/video_zencoder/includes/README.markdown
deleted file mode 100644
index 0be2256..0000000
--- a/modules/video_zencoder/includes/README.markdown
+++ /dev/null
@@ -1,199 +0,0 @@
-Zencoder API PHP Library
-==========================
-
-Author:  [Steve Heffernan](http://www.steveheffernan.com) (steve (a) zencoder (.) c&#1;om)  
-Company: [Zencoder - Online Video Encoder](http://zencoder.com)  
-Version: 1.1  
-Date:    2010-06-04  
-Repository: <http://github.com/zencoder/zencoder-php/>  
-
-For more details on the Zencoder API requirements visit  
-<http://zencoder.com/docs/api>
-
-
-ENCODING JOB
-------------
-The ZencoderJob object creates an encoding job using [cURL](http://zencoder.com/docs/glossary/curl/)
-to send [JSON](http://zencoder.com/docs/glossary/json/) formatted parameters to Zencoder's encoding API.
-
-### Step 1
-Visit the [API builder](https://app.zencoder.com/api_builder) in your account,
-and execute a successful encoding job.
-
-### Step 2
-Copy the successful JSON string, starting with the first curly brace "{",
-and pass it as the parameters for a new ZencoderJob object. Execute the script on your server to test that it works.
-
-#### Example
-    <pre>
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require_once("zencoder-php/Zencoder.php");
-
-    // New Encoding Job
-    $encoding_job = new ZencoderJob('
-      {
-        "api_key": "93h630j1dsyshjef620qlkavnmzui3",
-        "input": "s3://bucket-name/file-name.avi"
-        "outputs": [
-          {
-            "label": "web"
-          }
-        ]
-      }
-    ');
-
-    // Check if it worked
-    if ($encoding_job->created) {
-      // Success
-      echo "w00t! \n\n";
-      echo "Job ID: ".$encoding_job->id."\n";
-      echo "Output '".$encoding_job->outputs["web"]->label."' ID: ".$encoding_job->outputs["web"]->id."\n";
-      // Store Job/Output IDs to update their status when notified or to check their progress.
-    } else {
-      // Failed
-      echo "Fail :(\n\n";
-      echo "Errors:\n";
-      foreach($encoding_job->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-    echo "\nAll Job Attributes:\n";
-    var_dump($encoding_job);
-
-    ?>
-    </pre>
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [API Request History](https://app.zencoder.com/api_requests) may come in handy.  
-You can revisit your [API builder](https://app.zencoder.com/api_builder) to add/update parameters of the JSON.  
-
-You can translate the JSON string into nested associative arrays so that you can dynamically change attributes like "input".  
-The previous JSON example would become:
-
-    $encoding_job = new ZencoderJob(array(
-      "api_key" => "93h630j1dsyshjef620qlkavnmzui3",
-      "input" => "s3://bucket-name/file-name.avi",
-      "outputs" => array(
-        array(
-          "label" => "web"
-        )
-      )
-    ));
-
-
-GENERAL API REQUESTS
---------------------
-A general API request can be used for all API functionality including **Job Listing**, **Job Details**, **Account Creation**, **Account Details** (even Job Creation if desired). See the [API docs](http://zencoder.com/docs/api/) for all possible API requests.
-The first argument is the **API URL**.  
-The second argument is your **API Key**.  
-The third argument is the **request parameters** if needed. It can either be a JSON string or an array of parameters.
-
-
-#### Example Job List Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/jobs',
-      '93h630j1dsyshjef620qlkavnmzui3'
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-#### Example Account Creation Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/account', 
-      false, // API key isn't needed for new account creation
-      array(
-        "terms_of_service" => "1",
-        "email" => "test@example.com",
-        "password" => "1234"
-      )
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-
-NOTIFICATION HANDLING
-----------------------
-The ZencoderOutputNotification class is used to capture and parse JSON data sent from
-Zencoder to your app when an output file has been completed.
-
-
-
-### Step 1
-Create a script to receive notifications, and upload it to a location on your server that is publicly accessible.
-
-#### Example
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require("Zencoder.php");
-
-    // Catch notification
-    $notification = ZencoderOutputNotification::catch_and_parse();
-
-    // Check output/job state
-    if($notification->output->state == "finished") {
-      echo "w00t!\n";
-
-      // If you're encoding to multiple outputs and only care when all of the outputs are finished
-      // you can check if the entire job is finished.
-      if($notification->job->state == "finished") {
-        echo "Dubble w00t!";
-      }
-    } elseif ($notification->output->state == "cancelled") {
-      echo "Cancelled!\n";
-    } else {
-      echo "Fail!\n";
-      echo $notification->output->error_message."\n";
-      echo $notification->output->error_link;
-    }
-
-    ?>
-
-### Step 2
-In the parameters for an encoding job, add the URL for your script to the notifications array of each output you want to be notified for. 
-Then submit the job to test if it works.  
-
-**You can view the results at:**  
-<https://app.zencoder.com/notifications>
-
-#### Example
-    ...
-    "outputs" => array(
-      array(
-        "label" => "web",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      ),
-      array(
-        "label" => "iPhone",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      )
-    )
-    ...
-
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [notifications page](https://app.zencoder.com/notifications) will come in handy.
-
-VERSIONS
----------
-    Version 1.1 - 2010-06-04    Added General API Requests
-    Version 1.0 - 2010-04-02    Jobs and Notifications.
\ No newline at end of file
diff --git a/modules/video_zencoder/includes/Zencoder.php b/modules/video_zencoder/includes/Zencoder.php
deleted file mode 100644
index 4ff0db7..0000000
--- a/modules/video_zencoder/includes/Zencoder.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*
-
-  Zencoder API PHP Library
-  Version: 1.0
-  See the README file for info on how to use this library.
-
-*/
-define('ZENCODER_LIBRARY_NAME',  "ZencoderPHP");
-define('ZENCODER_LIBRARY_VERSION',  "1.0");
-
-// Add JSON functions for PHP < 5.2.0
-if(!function_exists('json_encode')) {
-  require_once('lib/JSON.php');
-  $GLOBALS['JSON_OBJECT'] = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-  function json_encode($value) { return $GLOBALS['JSON_OBJECT']->encode($value); }
-  function json_decode($value) { return $GLOBALS['JSON_OBJECT']->decode($value); }
-}
-
-class ZencoderJob {
-
-  var $new_job_url = "https://app.zencoder.com/api/jobs"; //https://app.zencoder.com/api/jobs
-  //https://zencoder-staging.heroku.com/api/jobs
-  var $new_job_params = array();
-  var $new_job_json;
-  var $created = false;
-  var $errors = array();
-
-  // Attributes
-  var $id;
-  var $outputs = array();
-
-  // Initialize
-  function ZencoderJob($params, $options = array()) {
-
-    // Build using params if not sending request
-    if($options["build"]) {
-      $this->update_attributes($params);
-      return true;
-    }
-
-    $this->new_job_params = $params;
-    $this->created = $this->create();
-  }
-
-  // Send Job Request to API
-  function create() {
-    // Send request
-    $request = new ZencoderRequest($this->new_job_url, false, $this->new_job_params);
-
-    if($request->successful) {
-      $this->update_attributes($request->results);
-      return true;
-    } else {
-      $this->errors = array_merge($this->errors, $request->errors);
-      return false;
-    }
-  }
-
-  // Add/Update attributes on the job object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      // Create output file objects
-      if($attr_name == "outputs" && is_array($attr_value)) {
-        $this->create_outputs($attr_value);
-      } elseif (!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-
-  // Create output file objects from returned parameters.
-  // Use the Label for the key if avaiable.
-  function create_outputs($outputs = array()) {
-    foreach($outputs as $output_attrs) {
-      if($output_attrs["label"]) {
-        $this->outputs[$output_attrs["label"]] = new ZencoderOutputFile($output_attrs);
-      } else {
-        $this->outputs[] = new ZencoderOutputFile($output_attrs);
-      }
-    }
-  }
-}
-
-class ZencoderOutputFile {
-
-  var $id;
-  var $label;
-  var $url;
-  var $state;
-  var $error_message;
-  var $error_link;
-
-  function ZencoderOutputFile($attributes = array()) {
-    $this->update_attributes($attributes);
-  }
-
-  // Add/Update attributes on the file object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      if(!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-}
-
-// General API request class
-class ZencoderRequest {
-
-  var $successful = false;
-  var $errors = array();
-  var $raw_results;
-  var $results;
-
-  function ZencoderRequest($url, $api_key = "", $params = "") {
-
-    // Add api_key to url if supplied
-    if($api_key) {
-      $url .= "?api_key=".$api_key;
-    }
-
-    // Get JSON
-    if(is_string($params)) {
-      $json = trim($params);
-    } else if(is_array($params)) {
-      $json = json_encode($params);
-    } else {
-      $json = false;
-    }
-
-    // Create request
-    $request = new ZencoderCURL($url, $json);
-
-    // Check for connection errors
-    if ($request->connected == false) {
-      $this->errors[] = $request->error;
-      return;
-    }
-
-    $status_code = intval($request->status_code);
-    $this->raw_results = $request->results;
-
-    // Parse returned JSON
-    $this->results = json_decode($this->raw_results, true);
-
-    // Return based on HTTP status code
-    if($status_code >= 200 && $status_code <= 206) {
-      $this->successful = true;
-    } else {
-      // Get job request errors if any
-      if(is_array($this->results["errors"])) {
-        foreach($this->results["errors"] as $error) {
-          $this->errors[] = $error;
-        }
-      } else {
-        $this->errors[] = "Unknown Error\n\nHTTP Status Code: ".$request->status_code."\n"."Raw Results: \n".$request->raw_results;
-      }
-    }
-  }
-}
-
-// ZencoderCURL
-// The connection class to perform the actual request to the surver
-// using cURL http://php.net/manual/en/book.curl.php
-class ZencoderCURL {
-
-  var $options = array(
-    CURLOPT_RETURNTRANSFER => 1, // Return content of the url
-    CURLOPT_HEADER => 0, // Don't return the header in result
-    CURLOPT_HTTPHEADER => array("Content-Type: application/json", "Accept: application/json"),
-    CURLOPT_CONNECTTIMEOUT => 0, // Time in seconds to timeout send request. 0 is no timeout.
-    CURLOPT_FOLLOWLOCATION => 1, // Follow redirects.
-  );
-
-  var $connected;
-  var $results;
-  var $status_code;
-  var $error;
-
-  // Initialize
-  function ZencoderCURL($url, $json, $options = array()) {
-
-    // Add library details to request
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Name: ".ZENCODER_LIBRARY_NAME;
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Version: ".ZENCODER_LIBRARY_VERSION;
-
-    // If posting data
-    if($json) {
-      $this->options[CURLOPT_POST] = 1;
-      $this->options[CURLOPT_POSTFIELDS] = $json;
-    }
-
-    // Add cURL options to defaults (can't use array_merge)
-    foreach($options as $option_key => $option) {
-      $this->options[$option_key] = $option;
-    }
-
-    // Initialize session
-    $ch = curl_init($url);
-
-    // Set transfer options
-    curl_setopt_array($ch, $this->options);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-
-    // Execute session and store returned results
-    $this->results = curl_exec($ch);
-
-    // Store the HTTP status code given (201, 404, etc.)
-    $this->status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-    // Check for cURL error
-    if (curl_errno($ch)) {
-      $this->error = 'cURL connection error ('.curl_errno($ch).'): '.htmlspecialchars(curl_error($ch)).' <a href="http://www.google.com/search?q='.urlencode("curl error ".curl_error($ch)).'">Search</a>';
-      $this->connected = false;
-    } else {
-      $this->connected = true;
-    }
-
-    // Close session
-    curl_close($ch);
-  }
-}
-
-// Capture incoming notifications from Zencoder to your app
-class ZencoderOutputNotification {
-
-  var $output;
-  var $job;
-
-  function ZencoderOutputNotification($params) {
-    if($params["output"]) $this->output = new ZencoderOutputFile($params["output"]);
-    if($params["job"]) $this->job = new ZencoderJob($params["job"], array("build" => true));
-  }
-
-  function catch_and_parse() {
-    $notificiation_data = json_decode(trim(file_get_contents('php://input')), true);
-    return new ZencoderOutputNotification($notificiation_data);
-  }
-}
diff --git a/modules/video_zencoder/includes/lib/JSON.php b/modules/video_zencoder/includes/lib/JSON.php
deleted file mode 100644
index f36a203..0000000
--- a/modules/video_zencoder/includes/lib/JSON.php
+++ /dev/null
@@ -1,805 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met: Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following
- * disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * @category
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE',   1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR',  2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR',  3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ',  4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- * <code>
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- * </code>
- */
-class Services_JSON
-{
-   /**
-    * constructs a new JSON instance
-    *
-    * @param    int     $use    object behavior flags; combine with boolean-OR
-    *
-    *                           possible values:
-    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-    *                                   "{...}" syntax creates associative arrays
-    *                                   instead of objects in decode().
-    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-    *                                   Values which can't be encoded (e.g. resources)
-    *                                   appear as NULL instead of throwing errors.
-    *                                   By default, a deeply-nested resource will
-    *                                   bubble up with an error, so all return values
-    *                                   from encode() should be checked with isError()
-    */
-    function Services_JSON($use = 0)
-    {
-        $this->use = $use;
-    }
-
-   /**
-    * convert a string from one UTF-16 char to one UTF-8 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf16  UTF-16 character
-    * @return   string  UTF-8 character
-    * @access   private
-    */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * convert a string from one UTF-8 char to one UTF-16 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf8   UTF-8 character
-    * @return   string  UTF-16 character
-    * @access   private
-    */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch(strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * encodes an arbitrary variable into JSON format
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-
-            case 'NULL':
-                return 'null';
-
-            case 'integer':
-                return (int) $var;
-
-            case 'double':
-            case 'float':
-                return (float) $var;
-
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = strlen($var);
-
-               /*
-                * Iterate over every character in the string,
-                * escaping with a slash or encoding to UTF-8 where necessary
-                */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"'.$ascii.'"';
-
-            case 'array':
-               /*
-                * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
-                * also try to catch a sparsely populated associative
-                * array with numeric keys here because some JS engines
-                * will create an array with empty indexes up to
-                * max_index which can cause memory issues and because
-                * the keys, which may be relevant, will be remapped
-                * otherwise.
-                *
-                * As per the ECMA and JSON specification an object may
-                * have any string as a property. Unfortunately due to
-                * a hole in the ECMA specification if the key is a
-                * ECMA reserved word or starts with a digit the
-                * parameter is only accessible using ECMAScript's
-                * bracket notation.
-                */
-
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
-
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . join(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
-
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . join(',', $elements) . ']';
-
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
-
-   /**
-    * array-walking function for use in generating JSON-formatted name-value pairs
-    *
-    * @param    string  $name   name of key to use
-    * @param    mixed   $value  reference to an array element to be encoded
-    *
-    * @return   string  JSON-formatted name-value pair, like '"name":value'
-    * @access   private
-    */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->encode($value);
-
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->encode(strval($name)) . ':' . $encoded_value;
-    }
-
-   /**
-    * reduce a string by removing leading and trailing comments and whitespace
-    *
-    * @param    $str    string      string value to strip of comments and whitespace
-    *
-    * @return   string  string value stripped of comments and whitespace
-    * @access   private
-    */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
-
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
-
-            ), '', $str);
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-   /**
-    * decodes a JSON string into appropriate variable
-    *
-    * @param    string  $str    JSON-formatted string
-    *
-    * @return   mixed   number, boolean, string, array, or object
-    *                   corresponding to given JSON input string.
-    *                   See argument 1 to Services_JSON() above for object-output behavior.
-    *                   Note that decode() always returns strings
-    *                   in ASCII or UTF-8 format!
-    * @access   public
-    */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
-                                
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-if (class_exists('PEAR_Error')) {
-
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-} else {
-
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-
-        }
-    }
-
-}
-    
-?>
\ No newline at end of file
diff --git a/modules/video_zencoder/includes/zencoder.inc b/modules/video_zencoder/includes/zencoder.inc
deleted file mode 100644
index fd273ba..0000000
--- a/modules/video_zencoder/includes/zencoder.inc
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-
-/*
- * @file
- * Class file to handle amazon s3 transfers.
- *
- */
-
-// Include our class file.
-require_once('Zencoder.php');
-
-define('VIDEO_ZC_PENDING', 0);
-define('VIDEO_ZC_WORKING', 1);
-define('VIDEO_ZC_ACTIVE', 2);
-define('VIDEO_ZC_FAILED', 3);
-
-class video_zencoder_api {
-
-  private $access_key;
-  private $limit;
-  private $bucket;
-
-  public function __construct() {
-    $this->access_key = variable_get('video_zencoder_api_key', '');
-    $this->limit = variable_get('amazon_s3_limit', 5);
-    $this->bucket = variable_get('amazon_s3_bucket', '');
-  }
-
-  /**
-   * create transcoding job on Zencoder.com
-   */
-  public function create($file) {
-    global $base_url;
-    // API Key
-    $api_key = variable_get('video_zencoder_api_key', '');
-    // File details
-    $filename = $file->filename;
-    // Get varialbes
-    $bucket = $this->bucket;
-    $thumb_no = variable_get('video_thumbs', 5);
-
-    $thumb_size = variable_get('video_thumbs_size', '160x120');
-    $thumb_base = $baseurl;
-    $thumb_prefix = $filename;
-    // dimentions
-    $dimentions = explode('x', $file->dimentions);
-
-    $notify_url = variable_get('zc_notify_url', '');
-    $notify_email = variable_get('zc_notify_email', '');
-
-    // Job details
-    $input_name = $bucket . '/' . $filename;
-//    watchdog('zencoder', $input_name);
-    // thumbnails
-    // Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'videos/thumbnails');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $file->fid;
-
-    // Notifications
-//    if(!empty($notify_url))
-//    $notifications[] = array('format' => 'json', 'url' => 'http://123.231.58.90/drupal-6/postback/jobs');
-//    $url = $base_url . '/postback/jobs';
-    $url = 'http://123.231.63.138/postback/jobs';
-    $notifications[] = array('format' => 'json', 'url' => $url);
-
-    //get the presets
-    $presets = $file->presets;
-    $public = (variable_get('amazon_s3_private', FALSE)) ? 0 : 1;
-
-    // construct the output array with the presets
-    $zc_outputs = array();
-    foreach ($presets as $name => $preset) {
-      $zc_output = array();
-      $lable = 'VIDEO_' . $name . '_' . $file->fid;
-      $width = $dimentions[0];
-      $height = $dimentions[1];
-      $quality = $preset['quality'];
-      $speed = $preset['speed'];
-      $upscale = $preset['upscale'];
-      $stretch = $preset['stretch'];
-      $frame_rate = $preset['frame_rate'];
-      $max_frame_rate = $preset['max_frame_rate'];
-      $keyframe_interval = $preset['keyframe_interval'];
-      $video_bitrate = $preset['video_bitrate'];
-      $bitrate_cap = $preset['bitrate_cap'];
-      $buffer_size = $preset['buffer_size'];
-      $h264_profile = $preset['h264_profile'];
-      $h264_level = $preset['h264_level'];
-      $skip_video = $preset['skip_video'];
-      $audio_codec = $preset['audio_codec'];
-      $audio_bitrate = $preset['audio_bitrate'];
-      $audio_channels = $preset['audio_channels'];
-      $audio_sample_rate = $preset['audio_sample_rate'];
-      $skip_audio = $preset['skip_audio'];
-      $start_clip = $preset['start_clip'];
-      $clip_length = $preset['clip_length'];
-
-      if (!empty($lable))
-        $zc_output['label'] = $lable;
-      if (!empty($bucket))
-        $zc_output['url'] = 's3://' . $bucket . '/' . pathinfo($filename, PATHINFO_DIRNAME) . '/converted/' . pathinfo($filename, PATHINFO_FILENAME) . '.' . $preset['extension'];
-      if (!empty($public))
-        $zc_output['public'] = $public;
-      if (!empty($width))
-        $zc_output['width'] = $width;
-      if (!empty($height))
-        $zc_output['height'] = $height;
-      if (!empty($quality))
-        $zc_output['quality'] = $quality;
-      if (!empty($speed))
-        $zc_output['speed'] = $speed;
-      if (!empty($upscale))
-        $zc_output['upscale'] = $upscale;
-      if (!empty($frame_rate))
-        $zc_output['frame_rate'] = $frame_rate;
-      if (!empty($max_frame_rate))
-        $zc_output['max_frame_rate'] = $max_frame_rate;
-      if (!empty($keyframe_interval))
-        $zc_output['keyframe_interval'] = $keyframe_interval;
-      if (!empty($video_bitrate))
-        $zc_output['video_bitrate'] = $video_bitrate;
-      if (!empty($bitrate_cap))
-        $zc_output['bitrate_cap'] = $bitrate_cap;
-      if (!empty($buffer_size))
-        $zc_output['buffer_size'] = $buffer_size;
-      if (!empty($h264_profile))
-        $zc_output['h264_profile'] = $h264_profile;
-      if (!empty($h264_level))
-        $zc_output['h264_level'] = $h264_level;
-      if (!empty($skip_video))
-        $zc_output['skip_video'] = $skip_video;
-      if (!empty($audio_codec))
-        $zc_output['audio_codec'] = $audio_codec;
-      if (!empty($audio_bitrate))
-        $zc_output['audio_bitrate'] = $audio_bitrate;
-      if (!empty($audio_channels))
-        $zc_output['audio_channels'] = $audio_channels;
-      if (!empty($audio_sample_rate))
-        $zc_output['audio_sample_rate'] = $audio_sample_rate;
-      if (!empty($skip_audio))
-        $zc_output['skip_audio'] = $skip_audio;
-      if (!empty($start_clip))
-        $zc_output['start_clip'] = $start_clip;
-      if (!empty($clip_length))
-        $zc_output['clip_length'] = $clip_length;
-
-      // thumbnails
-      $thumbnails['number'] = $thumb_no;
-      if (!empty($thumb_size))
-        $thumbnails['thumb_size'] = $thumb_size;
-      if (!empty($bucket))
-        $thumbnails['base_url'] = 's3://' . $bucket . '/' . $final_thumb_path;
-      if (!empty($file->fid))
-        $thumbnails['prefix'] = $file->fid;
-      $zc_output['thumbnails'] = $thumbnails;
-
-      //notifications
-      if (!empty($notify_email))
-        $notifications[] = $notify_email;
-      $zc_output['notifications'] = $notifications;
-      $zc_outputs[] = $zc_output;
-    }
-
-
-    $encoding_job_json = array(
-//            'test' => 1,
-//            'download_connections' => -1,
-      'api_key' => $this->access_key,
-      'input' => 's3://' . $input_name,
-      'outputs' => $zc_outputs
-    );
-
-//    print_r(($encoding_job_json));
-//    exit;
-//    watchdog('zencoder', json_encode($encoding_job_json));
-
-    $encoding_job = new ZencoderJob(json_encode($encoding_job_json));
-    // Check if it worked
-    if ($encoding_job->created) {
-//      watchdog('zencoder', serialize($encoding_job));
-      return $encoding_job;
-    } else {
-      foreach ($encoding_job->errors as $error) {
-        //      echo $error."\n";
-        watchdog('zencoder', 'Zencoder reports some errors. !error', array('!error' => $error), WATCHDOG_ERROR);
-      }
-      return false;
-    }
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-   */
-
-  public function update($video) {
-    $result = db_query("UPDATE {video_zencoder} SET status=%d, completed=%d WHERE jobid=%d",
-            $video->output->state, time(), $video->job->id);
-    return $result;
-  }
-
-  /*
-   * Verifies the existence of a file id, returns the row or false if none found.
-   */
-
-  public function load_job($jobid) {
-    $sql = db_query("SELECT * FROM {video_zencoder} WHERE jobid=%d", $jobid);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  /**
-   * Create Zencoder user account
-   */
-  public function create_user($user) {
-
-    $request = new ZencoderRequest(
-            'https://app.zencoder.com/api/account',
-            false, // API key isn't needed for new account creation
-            array(
-              "terms_of_service" => "1",
-              "email" => $user->email,
-              "affiliate_code" => "drupal-video"
-            )
-    );
-
-    if ($request->successful) {
-      $results = $request->results;
-      variable_set('video_zencoder_api_key', $results['api_key']);
-      $message = drupal_mail('video_zencoder', 'video_zencoder', $user->email, language_default(), $results);
-      if (!$message['result']) {
-        drupal_set_message(t('Unable to send e-mail!. Your Zencoder Details are as below.<br/> <b>API Key</b> : !api_key<br/> <b>Password</b> : !password<br/>', array('!api_key' => $results['api_key'], '!password' => $results['password'])), 'status');
-      } else {
-//        drupal_mail('video_zencoder', 'video_zencoder', 'heshanmw@gmail.com', language_default(), $results);
-        drupal_set_message(t('Your account has been created and is ready to start processing on Zencoder'));
-      }
-//      return $request->results;
-      return true;
-//      variable_set('video_zencoder_api_key', '');
-    } else {
-      $errors = '';
-      foreach ($request->errors as $error) {
-        if ($error == 'Email has already been taken') {
-          drupal_set_message(t('Your account already exists on Zencoder. So !login to here and enter API key below', array('!login' => l(t('login'), 'https://app.zencoder.com/session/new'))));
-          variable_set('video_zencoder_api_key', 'Please enter your API Key');
-          return TRUE;
-        }
-        $errors .= $error;
-      }
-      return $errors;
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/modules/video_zencoder/transcoders/video_zencoder.inc b/modules/video_zencoder/transcoders/video_zencoder.inc
deleted file mode 100644
index baaffc2..0000000
--- a/modules/video_zencoder/transcoders/video_zencoder.inc
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-
-/*
- * @file
- * Transcoder class file to handle ffmpeg_wrapper settings and conversions.
- * @TODO
- * - Cancel transcode job when delete.
- * - Add number of cronjobs pertime  set to 5 now.
- * - Replace load_completed_job with load_job
- * - Add a metadata extractor class to extract width and height
- *
- */
-
-class video_zencoder implements transcoder_interface {
-
-  private $name = 'Zencoder';
-  private $value = 'video_zencoder';
-
-  public function generate_thumbnails($video) {
-    global $user;
-    // Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'videos/thumbnails');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $video['fid'];
-
-    // Ensure the destination directory exists and is writable.
-    $directories = explode('/', $final_thumb_path);
-    // Get the file system directory.
-    $file_system = file_default_scheme() . ':/';
-    foreach ($directories as $directory) {
-      $full_path = isset($full_path) ? $full_path . '/' . $directory : $directory;
-      // Don't check directories outside the file system path.
-      if (strpos($full_path, $file_system) === 0) {
-        field_file_check_directory($full_path, FILE_CREATE_DIRECTORY);
-      }
-    }
-
-    $files = array();
-    // no thumbnails to generate
-    $number_of_thumbs = variable_get('video_thumbs', 5);
-    for ($i = 0; $i < $number_of_thumbs; $i++) {
-      // @TODO Remove hard coded file types
-      $filename = $video['fid'] . '_' . sprintf("%04d", $i) . '.png';
-      $thumbfile = $final_thumb_path . '/' . $filename;
-      //skip files already exists, this will save ffmpeg traffic
-      if (!is_file($thumbfile)) {
-        $default = drupal_get_path('module', 'video') . '/images/no-thumb.png';
-        // Download generated thumbnails from S3.
-        if (video_s3_get_object_info($thumbfile))
-          $s3_get_object = video_s3_get_object($thumbfile, $thumbfile);
-        else {
-          $thumbfile = $final_thumb_path . '/no-thumb.png';
-          file_copy($default, $thumbfile, FILE_EXISTS_REPLACE);
-        }
-//          $thumbfile = drupal_get_path('module', 'video') . '/images/no_thumb.gif';
-        if (!file_exists($thumbfile)) {
-          $error_param = array('%file' => $thumbfile, '%out' => $s3_get_object);
-          $error_msg = t("Error downloading thumbnail for video: generated file %file does not exist.<br />S3 Output:<br />%out", $error_param);
-          // Log the error message.
-          watchdog('zencoder', $error_msg, array(), WATCHDOG_ERROR);
-          continue;
-        }
-      }
-      // Begin building the file object.
-      // @TODO : use file_munge_filename()
-      $file = new stdClass();
-      $file->uid = $user->uid;
-      $file->status = FILE_STATUS_TEMPORARY;
-      $file->filename = trim($filename);
-      $file->filepath = $thumbfile;
-      $file->filemime = file_get_mimetype($filename);
-      $file->filesize = filesize($thumbfile);
-      $file->timestamp = time();
-      $files[] = $file;
-    }
-    return $files;
-  }
-
-  public function video_converted_extension() {
-    return variable_get('video_zencoder_ext', 'flv');
-  }
-
-  public function convert_video($video) {
-    // get the active jobs and check for the status
-    if ($video->video_status == VIDEO_RENDERING_ACTIVE) {
-      return;
-    }
-    // We need to check if this file id exists in our S3 table to avoid file not found error.
-    $s3_video = db_query("SELECT * FROM {video_s3} WHERE fid=%d", $video->fid);
-    if ($s3_file = db_fetch_object($s3_video)) {
-      // This is a s3 file, lets verify it has been pushed and if so lets push to Zencoder queue.
-      if ($s3_file->status == VIDEO_S3_COMPLETE) {
-        $video_s3 = $s3_file;
-      }
-    } else {
-      watchdog('zencoder', t('You must active the Video S3 module to work with Zencoder, file is not found in S3 tables', array()), array(), WATCHDOG_ERROR);
-//      return FALSE;
-    }
-
-    // If we have a video lets go ahead and send it.
-    if (is_object($video_s3)) {
-      // This will update our current video status to active.
-      $this->change_status($video->vid, VIDEO_RENDERING_ACTIVE);
-      // bucket name
-      $bucket = variable_get('amazon_s3_bucket', '');
-      $ssl = variable_get('amazon_s3_ssl', FALSE);
-
-      $filepath = $video_s3->filepath;
-      $video_s3->dimensions = $video->dimensions;
-      $filename = str_replace(' ', '_', $video_s3->filename);
-      $video_s3->presets = $video->presets;
-      module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-      $zc = new video_zencoder_api;
-      if ($encoding_job = $zc->create($video_s3)) {
-        // Update our table.
-        $video->vid = $video->vid;
-        //job id
-        $video->jobid = $encoding_job->id;
-        $outputs = new stdClass();
-//        print_r($encoding_job->outputs);
-        foreach ($encoding_job->outputs as $output) {
-          $outputs->{$output->id}->id = $output->id;
-          $outputs->{$output->id}->label = $output->label;
-          $outputs->{$output->id}->url = $output->url;
-          $outputs->{$output->id}->state = $output->state;
-          $outputs->{$output->id}->error_message = $output->error_message;
-          $outputs->{$output->id}->error_link = $output->error_link;
-        }
-        $video->data = serialize($outputs);
-        // write output values to the table
-        if ($this->update($video)) {
-          watchdog('zencoder', t('Successfully created trancoding job on !jobid.', array('!jobid' => $video->jobid)), array(), WATCHDOG_INFO);
-        }
-      } else {
-        watchdog('zencoder', 'Failed to queus our file to Zencoder.', array(), WATCHDOG_ERROR);
-        $this->change_status($video->vid, VIDEO_RENDERING_FAILED);
-        return FALSE;
-      }
-    } else {
-      watchdog('zencoder', 'We did not find the file id: ' . $video->fid . ' or it is still queued for ffmpeg processing or S3 push.', array(), WATCHDOG_DEBUG);
-//      return FALSE;
-    }
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_name()
-   */
-  public function get_name() {
-    return $this->name;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_value()
-   */
-  public function get_value() {
-    return $this->value;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_help()
-   */
-  public function get_help() {
-    $help = l(t('Zencoder'), 'http://zencoder.com/');
-    return $help;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#admin_settings()
-   */
-  public function admin_settings() {
-    global $user;
-    // check amazon s3 module is exists or not
-    if (!module_exists('video_s3'))
-      drupal_set_message(t('You must enable Video Amazon S3 Module to enable this module.'), 'error');
-
-    $form = array();
-    $form['video_zencoder_start'] = array(
-      '#type' => 'markup',
-      '#value' => '<div id="video_zencoder">',
-    );
-    $zencoder_api = variable_get('video_zencoder_api_key', null);
-    if (!isset($zencoder_api) && empty($zencoder_api)) {
-      $form['zencoder_user'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Zencoder User'),
-        '#collapsible' => FALSE,
-        '#collapsed' => FALSE,
-        '#description' => t('Save configurations to creare your !link account to transcode and manage your videos using Zencode  API. Once you save your configurations then this will automatically create an account on the Zencoder.com and password and all ther other relevent details will be emailled to you.', array('!link' => l(t('Zencoder.com'), 'http://zencoder.com')))
-      );
-      $form['zencoder_user']['zencoder_username'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Your email address'),
-        '#default_value' => variable_get('zencoder_username', 'me@localhost'),
-        '#size' => 50,
-        '#description' => t('Make sure the email is accurate, since we will send all the password details to manage transcoding online and API key details to this.')
-      );
-
-      $form['zencoder_user']['agree_terms_zencoder'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Agree Zencoder Terms and Conditions.'),
-        '#default_value' => variable_get('agree_terms_zencoder', TRUE),
-        '#description' => t('Read terms and conditions on !link.', array('!link' => l(t('Zencoder.com'), 'http://zencoder.com'))),
-      );
-    } else {
-      // Zencoder API is exists
-      $form['zencoder_info'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Zencoder API'),
-        '#collapsible' => FALSE,
-        '#collapsed' => FALSE,
-      );
-      $form['zencoder_info']['video_zencoder_api_key'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Zencoder API Key'),
-        '#default_value' => variable_get('video_zencoder_api_key', null),
-        '#description' => t('Zencoder API Key. Click <b>Reset to default</b> button to add new account.')
-      );
-      $form['zencoder_info']['video_thumbs'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Number of thumbnails'),
-        '#description' => t('Number of thumbnails to display from video.'),
-        '#default_value' => variable_get('video_thumbs', 5),
-        '#size' => 5
-      );
-      $form['zencoder_info']['video_thumbs_size'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Dimention of thumbnails'),
-        '#description' => t('Size of thumbnails to extract from video.'),
-        '#default_value' => variable_get('video_thumbs_size', '160x120'),
-        '#size' => 10
-      );
-    }
-    $form['video_zencoder_end'] = array(
-      '#type' => 'markup',
-      '#value' => '</div>',
-    );
-    return $form;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#admin_settings_validate()
-   */
-  public function admin_settings_validate($form, &$form_state) {
-    $zencoder_api = isset($form_state['values']['video_zencoder_api_key']) ? $form_state['values']['video_zencoder_api_key'] : NULL;
-    if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['video_convertor'] != 'video_zencoder') {
-      if (variable_get('video_filesystem', 'drupal') != 'video_s3') {
-        form_set_error('video_zencoder', t('You must enable the Amazon S3 as !link.', array('!link' => l(t('FileSystem'), 'admin/settings/video/filesystem'))));
-      }
-      return;
-    }
-
-    $errors = false;
-    // check terms and condition
-    if ($form_state['values']['agree_terms_zencoder'] == 0) {
-      $errors = true;
-      form_set_error('agree_terms_zencoder', t('You must agree terms and conditions.', array()));
-    }
-    // check for email exists
-    // Validate the e-mail address:
-    if ($error = user_validate_mail($form_state['values']['zencoder_username'])) {
-      $errors = true;
-      form_set_error('zencoder_username', $error);
-    }
-
-    // get the API key from zencoder and save it to variable
-    if (!$errors) {
-      $email = $form_state['values']['zencoder_username'];
-      module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-      $zc = new video_zencoder_api;
-//    if(!($error = $zc->create_user($user)))
-//            form_set_error('zencoder_username', $error);
-      $user = new stdClass;
-      $user->email = $email;
-      $result = $zc->create_user($user);
-      if ($result !== true)
-        form_set_error('zencoder_username', $result);
-    }
-  }
-
-  /**
-   * Return the dimensions of a video
-   */
-  public function get_dimensions($video) {
-    // @TODO get object properties
-    return;
-  }
-
-  public function create_job($video) {
-    return db_query("INSERT INTO {video_zencoder} (fid, status, dimensions) VALUES (%d, %d, '%s')", $video['fid'], VIDEO_RENDERING_PENDING, $video['dimensions']);
-  }
-
-  public function update_job($video) {
-    if (!$this->load_job($video['fid']))
-      return;
-    //lets update our table to include the nid
-    db_query("UPDATE {video_zencoder} SET nid=%d WHERE fid=%d", $video['nid'], $video['fid']);
-  }
-
-  public function delete_job($video) {
-    if (!$this->load_job($video->fid))
-      return;
-    //lets get all our videos and unlink them
-    $sql = db_query("SELECT vid FROM {video_zencoder} WHERE fid=%d", $video->fid);
-    //we loop here as future development will include multiple video types (HTML 5)
-    while ($row = db_fetch_object($sql)) {
-      // @TODO : cancel the job to transcode
-    }
-    //now delete our rows.
-    db_query('DELETE FROM {video_zencoder} WHERE fid = %d', $video->fid);
-  }
-
-  public function load_job($fid) {
-    $job = null;
-    $result = db_query('SELECT f.*, vf.vid, vf.nid, vf.dimensions, vf.status as video_status FROM {video_zencoder} vf LEFT JOIN {files} f ON vf.fid = f.fid WHERE f.fid=vf.fid AND f.fid = %d', $fid);
-    $job = db_fetch_object($result);
-    if (!empty($job))
-      return $job;
-    else
-      return FALSE;
-  }
-
-  public function load_job_queue() {
-    // load jobs with status as pending and active both
-    $total_videos = variable_get('video_instances', 5);
-    $videos = array();
-    $result = db_query_range('SELECT f.*, vf.vid, vf.nid, vf.dimensions, vf.status as video_status FROM {video_zencoder} vf LEFT JOIN {files} f ON vf.fid = f.fid WHERE vf.status = %d AND f.status = %d ORDER BY f.timestamp',
-            VIDEO_RENDERING_PENDING, FILE_STATUS_PERMANENT, 0, $total_videos);
-
-    while ($row = db_fetch_object($result)) {
-      $videos[] = $row;
-    }
-    return $videos;
-  }
-
-  /**
-   * @todo : replace with the load job method
-   * @param <type> $video
-   * @return <type>
-   */
-  public function load_completed_job(&$video) {
-    module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-    $video_row = db_fetch_object(db_query('SELECT data FROM {video_zencoder} WHERE fid = %d', $video->fid));
-    $data = unserialize($video_row->data);
-    if(empty($data))
-      return $video;
-    foreach ($data as $value) {
-      $extension = pathinfo($value->url, PATHINFO_EXTENSION);
-      $video->files->{$extension}->filename = pathinfo($value->url, PATHINFO_FILENAME) . '.' . $extension;
-      $video->files->{$extension}->filepath = $value->url;
-      $video->files->{$extension}->url = (!variable_get('amazon_s3_private', FALSE)) ? $value->url : video_s3_get_authenticated_url($video->filename);
-      $video->files->{$extension}->extension = $extension;
-      $video->player = strtolower($extension);
-    }
-    return $video;
-  }
-
-  /**
-   * Change the status of the file.
-   *
-   * @param (int) $vid
-   * @param (int) $status
-   */
-  public function change_status($vid, $status) {
-    $result = db_query('UPDATE {video_zencoder} SET status = %d WHERE vid = %d ', $status, $vid);
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-   */
-
-  private function update($video) {
-    $result = db_query("UPDATE {video_zencoder} SET jobid = %d, completed=%d, data='%s' WHERE vid=%d",
-            $video->jobid, time(), $video->data, $video->vid);
-    return $result;
-  }
-
-}
\ No newline at end of file
diff --git a/modules/video_zencoder/video_zencoder.info b/modules/video_zencoder/video_zencoder.info
deleted file mode 100644
index d7d221a..0000000
--- a/modules/video_zencoder/video_zencoder.info
+++ /dev/null
@@ -1,7 +0,0 @@
-
-name = Zencoder API on Video
-description = Zencoder is a webservice to transcode videos.
-package = Video
-core = 7.x
-dependencies[] = video
-dependencies[] = video_s3
\ No newline at end of file
diff --git a/modules/video_zencoder/video_zencoder.install b/modules/video_zencoder/video_zencoder.install
deleted file mode 100644
index 513ebe1..0000000
--- a/modules/video_zencoder/video_zencoder.install
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-
-/**
- * @file
- * Provides installation functions for video_s3.module.
- */
-
-/**
- * Implementation of hook_schema().
- */
-function video_zencoder_schema() {
-  $schema['video_zencoder'] = array(
-    'description' => t('Store video s3 cdn and convert with zencoder webservice'),
-    'fields' => array(
-      'vid' => array(
-        'description' => t('Auto Increment id'),
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'fid' => array(
-        'description' => t('Original file id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'nid' => array(
-        'description' => t('Node id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'jobid' => array(
-        'description' => t('Job id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'status' => array(
-        'description' => t('Status of the cdn transfer'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'dimensions' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The dimensions of the video.'),
-      ),
-      'completed' => array(
-        'description' => t('Time of successful completion to amazon.'),
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'data' => array(
-        'type' => 'text',
-        'not null' => FALSE,
-        'size' => 'big',
-        'description' => 'A serialized array of converted files. Use of this field is discouraged and it will likely disappear in a future version of Drupal.',
-      ),
-    ),
-    'indexes' => array(
-      'status' => array('status'),
-      'file' => array('fid'),
-    ),
-    'primary key' => array('vid'),
-  );
-  return $schema;
-}
-
-/**
- * Implementation of hook_install().
- */
-function video_zencoder_install() {
-  drupal_install_schema('video_zencoder');
-  // set the module weight to low since we need this to load later time than in S3
-  db_query("UPDATE {system} SET weight = 50 WHERE name = 'video_zencoder'");
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function video_zencoder_uninstall() {
-  drupal_uninstall_schema('video_zencoder');
-  // TODO : Delete our variables.
-}
-
-// ALTER TABLE `video_zencoder` ADD `dimensions` VARCHAR( 255 ) NULL AFTER `filesize` ;
-/**
- * Update 6401
- * Adding new dimentaion row to the table
- * @return <type>
- */
-function video_zencoder_update_6401() {
-  $ret = array();
-  // set settings column to accept larger values
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql('ALTER TABLE {video_zencoder} ADD dimensions VARCHAR( 255 ) NULL NULL AFTER filesize');
-      break;
-
-    case 'pgsql':
-      db_add_column($ret, 'video_zencoder', 'dimensions', 'VARCHAR', array('null' => TRUE));
-      break;
-  }
-
-  return $ret;
-}
-
-/**
- * Update 6402
- * Adding data field and remove unwanted fields from the table
- * @return <type>
- */
-function video_zencoder_update_6402() {
-  $ret = array();
-  // drop un wanted fields in video zencoder
-  db_drop_field($ret, 'video_zencoder', 'filesize');
-  db_drop_field($ret, 'video_zencoder', 'outputid');
-  db_drop_field($ret, 'video_zencoder', 'bucket');
-  db_drop_field($ret, 'video_zencoder', 'filename');
-  db_drop_field($ret, 'video_zencoder', 'filepath');
-  db_drop_field($ret, 'video_zencoder', 'filemime');
-  db_add_column($ret, 'video_zencoder', 'data', 'longtext', array('null' => TRUE));
-  return $ret;
-}
diff --git a/modules/video_zencoder/video_zencoder.module b/modules/video_zencoder/video_zencoder.module
deleted file mode 100644
index 0919866..0000000
--- a/modules/video_zencoder/video_zencoder.module
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides wrapper functions for the s3 amazon webservices.
- * @todo
- * - cleand up the _video_zencoder_postback_jobs() function
- * - Add to select random thumbnails to the download image.
- */
-/*
- * Implementation of hook_cron().
- */
-defined('VIDEO_RENDERING_PENDING') ||
-    define('VIDEO_RENDERING_PENDING', 1);
-defined('VIDEO_RENDERING_ACTIVE') ||
-    define('VIDEO_RENDERING_ACTIVE', 5);
-defined('VIDEO_RENDERING_COMPLETE') ||
-    define('VIDEO_RENDERING_COMPLETE', 10);
-defined('VIDEO_RENDERING_FAILED') ||
-    define('VIDEO_RENDERING_FAILED', 20);
-
-/**
- * Implementation of hook_menu().
- */
-function video_zencoder_menu() {
-  $items = array();
-  $items['postback/jobs'] = array(
-//    'title' => 'Video',
-//    'description' => 'Configure different aspects of the video module and its plugins',
-    'page callback' => '_video_zencoder_postback_jobs',
-    'access arguments' => array('access content'),
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
-}
-
-/**
- * This will handle Zencoder postback once video conversion is completed
- *
- */
-function _video_zencoder_postback_jobs() {
-// get JSON post data
-  $data = file_get_contents("php://input");
-  watchdog('zencoder', t('Postback received from the Zencoder Transcoding servers.' . serialize($data)));
-//    print_r($data);
-//  exit;
-// get the file object by zenocder job id
-  $video = json_decode($data);
-//  print_r($zc);
-//  $zc_job_id = $video->job->id;
-  $zc_job_state = trim($video->job->state);
-//  $zc_output_id = $video->output->id;
-  $zc_output_state = trim($video->output->state);
-//  $zc_output_url = $video->output->url;
-  if ($zc_output_state == 'finished' && $zc_job_state == 'finished')
-    $video->output->state = VIDEO_RENDERING_COMPLETE;
-  if ($zc_output_state == 'failed' || $zc_job_state == 'failed')
-    $video->output->state = VIDEO_RENDERING_FAILED;
-  if ($zc_job_state == 'processing') {
-    watchdog('zencoder', t('Job !jobid is processing.', array('!jobid' => $video->job->id)));
-    return;
-  }
-
-// update the Zencoder Job
-  module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-  $zc = new video_zencoder_api;
-// Lets run delete.
-  $videodb = $zc->load_job($video->job->id);
-//  print_r($video);
-//  echo $nid = $videodb->nid;
-//  echo $vid = $videodb->vid;
-//  echo $fid = $videodb->fid;
-
-  if ($video->output->state == VIDEO_RENDERING_COMPLETE) {
-//    echo 'completed';
-    $nid = $videodb->nid;
-    $vid = $videodb->vid;
-    $fid = $videodb->fid;
-//    print_r($videodb);
-//    echo 'working completed';
-    if (!db_query('UPDATE {video_zencoder} SET status = %d WHERE vid = %d ', VIDEO_RENDERING_COMPLETE, $vid))
-      watchdog('zencoder', t('Error updating zencoder status.', array()), NULL, WATCHDOG_ERROR);
-
-    if (!db_query("UPDATE {node} SET status=%d WHERE nid=%d", 1, $nid))
-      watchdog('zencoder', t('Error pulishing node.', array()), NULL, WATCHDOG_ERROR);
-
-//    print_r($video);
-// update the thumbanils
-// this will update the default thumbnails, if user want to select another one then they wil need to edit the node
-// Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'videos/thumbnails');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $fid;
-//    $i = rand(0, (variable_get('no_of_video_thumbs', 5) - 1));
-    $filename = $fid . '_' . sprintf("%04d", 1) . '.png';
-    $thumbfile = $final_thumb_path . '/' . $filename;
-
-    if (video_s3_get_object_info($thumbfile)) {
-      $default = $final_thumb_path . '/no-thumb.png';
-      file_delete($default);
-      if (video_s3_get_object($thumbfile, $default))
-        watchdog('zencoder', t('Successfully downloaded the thumbnails file and replaced the default image.'));
-      else
-        watchdog('zencoder', t('Download thumbanils files is failed.'), array(), WATCHDOG_ERROR);
-    }
-//      file_copy($default, $thumbfile, FILE_EXISTS_REPLACE);
-    watchdog('zencoder', t('Updated the Zencoder Job !id to states !states.', array('!id' => $video->job->id, '!states' => $zc_output_state)));
-  }
-  else if ($video->output->state == VIDEO_RENDERING_FAILED) {
-    echo 'working failed';
-    $this->change_status($vid, VIDEO_RENDERING_FAILED);
-    watchdog('zencoder', t('Zencoder job failed converting videos, please login to zencoder web and check the erros.', array()), NULL, WATCHDOG_ERROR);
-  } else {
-    echo 'working something else';
-  }
-}
-
-/**
- * Implementation of hook_mail().
- */
-function video_zencoder_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $message['subject'] .= 'Zencoder Registration Details for Drupal Video';
-  $message['body'][] = video_zencoder_mail_default($params);
-}
-
-function video_zencoder_mail_default($params) {
-  return t(
-      'Welcome to Zencoder for Drupal
--------------------------------
-
-Your account has been created and is ready to start processing.
-
-Your account details are as below.
-
-API Key : %api_key
-Password : %password
-
-* Login URL: https://app.zencoder.com/login
-
-You can get help at the following places:
-
-* Our chat room at http://zencoder.com/chat
-* Customer forums at https://help.zencoder.com/forums
-* The help desk at https://help.zencoder.com/tickets/new
-
-We\'d love to hear from you. Let us know how we can help. Thanks!
-
-Thanks,
--Zencoder for Drupal Team', array('%api_key' => $params['api_key'], '%password' => $params['password']));
-}
-
diff --git a/transcoders/video_ffmpeg.inc b/transcoders/video_ffmpeg.inc
index 7aed020..343d896 100644
--- a/transcoders/video_ffmpeg.inc
+++ b/transcoders/video_ffmpeg.inc
@@ -100,6 +100,7 @@ class video_ffmpeg implements transcoder_interface {
     // This will update our current video status to active.
 //    $this->change_status($video->vid, VIDEO_RENDERING_ACTIVE);
     // get the paths so tokens will compatible with this
+    // @todo : add best method to get existing file path and add converted there
     $target = str_replace('original', '', drupal_dirname($video->uri));
     $converted = $target . '/converted/' . $video->fid;
     if (!file_prepare_directory($converted, FILE_CREATE_DIRECTORY)) {
diff --git a/video.install b/video.install
index 828496b..51d9202 100644
--- a/video.install
+++ b/video.install
@@ -162,12 +162,6 @@ function video_field_schema($field) {
         'not null' => FALSE,
         'unsigned' => TRUE,
       ),
-      'use_default_video_thumb' => array(
-        'description' => 'Use video thumbanil.',
-        'type' => 'int',
-        'not null' => FALSE,
-        'unsigned' => TRUE,
-      ),
       'player_dimensions' => array(
         'description' => "Video dimention for the video player.",
         'type' => 'varchar',