From 59b78ae81cea54317d3a35976876d531d25286ce Mon Sep 17 00:00:00 2001
From: gabrieljenik <gabriel.jenik@gmail.com>
Date: Fri, 24 Oct 2014 15:54:25 -0300
Subject: [PATCH] Update S3.php

Added initialize method for initiliazing S3 from a config file.

Usage:
			$this->load->library('s3');
			$this->s3 = new s3();
			$this->s3->initialize($config);

Sample config file: (to be placed under config/s3.php)

		<?php
		/*
		| -------------------------------------------------------------------
		| Amazon S3 Configuration
		| -------------------------------------------------------------------
		*/

		$config["accessKey"] = "AKIAJHFQ7V53XXI5CYTA";
		$config["secretKey"] = "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";
		$config["useSSL"] = FALSE;
		$config["endpoint"] = 's3.amazonaws.com';
---
 S3.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/S3.php b/S3.php
index 0b1564b2..209daacf 100644
--- a/S3.php
+++ b/S3.php
@@ -190,6 +190,29 @@ public function __construct($accessKey = null, $secretKey = null, $useSSL = fals
 		self::$endpoint = $endpoint;
 	}
 
+	/**
+	 * Initializes S3 from a config file.
+	 * 
+	 * @param array configuration
+	 * @return void
+	 */
+	public function initialize($config) {
+		
+		// Load config file if config not defined.
+		if (empty($config)) {
+			get_instance()->config->load('s3', TRUE);
+			$config = get_instance()->config->item('s3');
+		}
+		
+		foreach ($config as $key => $val) {
+			if(!in_array($key, array('accessKey', 'secretKey'))) {
+				self::$$key = $val;
+			}
+		}
+		
+		if (isset($config["accessKey"]) && isset($config["secretKey"]))
+			self::setAuth($config["accessKey"], $config["secretKey"]);
+	}
 
 	/**
 	* Set the service endpoint