fixed merging conflicts

Author: onema

README.md

@@ -3,11 +3,9 @@
 A fully RESTful server implementation for CodeIgniter using one library, one
 config file and one controller.
 
-## Sponsored by: Coding Futures
-
 ## Requirements
 
-1. PHP 5.2+
+1. PHP 5.2 or greater
 2. CodeIgniter 2.1.0 to 3.0-dev
 
 _Note: for 1.7.x support download v2.2 from Downloads tab_
@@ -53,7 +51,7 @@ This means your URLs can look like this:
 	http://example.com/books.json
 	http://example.com/books?format=json
 
-Alternatively (and recommend) is using the HTTP `Accept` header, which is built for this purpose:
+This can be flaky with URI segments, so the recommend approach is using the HTTP `Accept` header:
 
 	$ curl -H "Accept: application/json" http://example.com
 
@@ -148,6 +146,17 @@ By default, the HTTP will be `X-API-KEY`. This can be configured in **config/res
 
 ## Change Log
 
+### 2.6.1
+
+* Update CodeIgniter files to 2.1.2
+* Log Table support for IPv6 & NULL parameters
+* Abstract out the processes of firing a controller method within _remap() to an separate method
+* Moved GET, POST, PUT, and DELETE parsing to separate methods, allowing them to be overridden as needed
+* Small bugfix for a PHP 5.3 strlen error
+* Fixed some PHP 5.4 warnings
+* Fix for bug in Format.php's to_html() which failed to detect if $data was really a multidimensional array.
+* Fix for empty node on XML output format, for false = 0, true = 1.
+
 ### 2.6.0
 
 * Added loads of PHPDoc comments.
@@ -198,7 +207,12 @@ By default, the HTTP will be `X-API-KEY`. This can be configured in **config/res
 * key => FALSE can now be used to override the keys_enabled option for a specific method, and level is now optional. If no level is set it will assume the method has a level of 0.
 * Fixed issue where calls to ->get('foo') would error is foo was not set. Reported by  Paul Barto.
 
-## Donations
+## Contributions
+
+This project has been funded and made possible through my clients kindly allowing me to 
+open-source the functionality as I build it into their projects. I am no longer actively developing 
+features for this as I no longer require it, but I will continue to maintain pull requests and try to 
+fix issues as and when they are reported (within a week or two). 
 
-If my REST Server has helped you out, or you'd like me to do some custom work on it, [please sponsor me](http://pledgie.com/campaigns/8328)
-so I can keep working on this and other CodeIgniter projects for you all.
+Pull Requests are the best way to fix bugs or add features. I know loads of you use this, so please 
+contribute if you have improvements to be made and I'll keep releasing versions over time.

application/config/mimes.php

@@ -10,7 +10,7 @@
 
 $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'cpt'	=>	'application/mac-compactpro',
-				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
 				'bin'	=>	'application/macbinary',
 				'dms'	=>	'application/octet-stream',
 				'lha'	=>	'application/octet-stream',
@@ -56,7 +56,7 @@
 				'midi'	=>	'audio/midi',
 				'mpga'	=>	'audio/mpeg',
 				'mp2'	=>	'audio/mpeg',
-				'mp3'	=>	array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'),
+				'mp3'	=>	array('audio/mpeg', 'audio/mpg', 'audio/mpeg3', 'audio/mp3'),
 				'aif'	=>	'audio/x-aiff',
 				'aiff'	=>	'audio/x-aiff',
 				'aifc'	=>	'audio/x-aiff',
@@ -65,8 +65,8 @@
 				'rpm'	=>	'audio/x-pn-realaudio-plugin',
 				'ra'	=>	'audio/x-realaudio',
 				'rv'	=>	'video/vnd.rn-realvideo',
-				'wav'	=>	'audio/x-wav',
-				'bmp'	=>	'image/bmp',
+				'wav'	=>	array('audio/x-wav', 'audio/wave', 'audio/wav'),
+				'bmp'	=>	array('image/bmp', 'image/x-windows-bmp'),
 				'gif'	=>	'image/gif',
 				'jpeg'	=>	array('image/jpeg', 'image/pjpeg'),
 				'jpg'	=>	array('image/jpeg', 'image/pjpeg'),
@@ -93,13 +93,14 @@
 				'avi'	=>	'video/x-msvideo',
 				'movie'	=>	'video/x-sgi-movie',
 				'doc'	=>	'application/msword',
-				'docx'	=>	'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-				'xlsx'	=>	'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'docx'	=>	array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'),
+				'xlsx'	=>	array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
 				'word'	=>	array('application/msword', 'application/octet-stream'),
 				'xl'	=>	'application/excel',
-				'eml'	=>	'message/rfc822'
+				'eml'	=>	'message/rfc822',
+				'json' => array('application/json', 'text/json')
 			);
 
 
 /* End of file mimes.php */
-/* Location: ./application/config/mimes.php */
+/* Location: ./application/config/mimes.php */

application/config/rest.php

@@ -1,5 +1,17 @@
 <?php defined('BASEPATH') OR exit('No direct script access allowed');
 
+/*
+|--------------------------------------------------------------------------
+| HTTP protocol
+|--------------------------------------------------------------------------
+|
+| Should the service accept only HTTPS requests or not?
+|
+|	Default: FALSE
+|
+*/
+$config['force_https'] = FALSE;
+
 /*
 |--------------------------------------------------------------------------
 | REST Format
@@ -165,6 +177,17 @@
 */
 $config['rest_enable_keys'] = FALSE;
 
+/*
+|--------------------------------------------------------------------------
+| REST Table Key Column Name
+|--------------------------------------------------------------------------
+|
+| If you are not using the default table schema as shown above, what is the 
+| name of the db column that holds the api key value?
+|
+*/
+$config['rest_key_column'] = 'key';
+
 /*
 |--------------------------------------------------------------------------
 | REST Key Length
@@ -221,7 +244,7 @@
 	  `api_key` varchar(40) NOT NULL,
 	  `ip_address` varchar(45) NOT NULL,
 	  `time` int(11) NOT NULL,
-	  `authorized` tinyint(1) NOT NULL,
+	  `authorized` tinyint(1) NOT NULL
 	  PRIMARY KEY (`id`)
 	) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 |

application/libraries/REST_Controller.php

@@ -11,7 +11,7 @@
  * @author        	Phil Sturgeon
  * @license         http://philsturgeon.co.uk/code/dbad-license
  * @link			https://github.com/philsturgeon/codeigniter-restserver
- * @version 		2.6.0
+ * @version 		2.6.1
  */
 abstract class REST_Controller extends CI_Controller
 {
@@ -60,6 +60,13 @@ abstract class REST_Controller extends CI_Controller
 	 */
 	protected $rest = NULL;
 
+	/**
+	 * Object to store data about the client sending the request
+	 *
+	 * @var object
+	 */
+    protected $client = NULL;	 
+
 	/**
 	 * The arguments for the GET request method
 	 *
@@ -145,8 +152,13 @@ public function __construct()
 		// Lets grab the config and get ready to party
 		$this->load->config('rest');
 
-		// How is this request being made? POST, DELETE, GET, PUT?
+		// let's learn about the request
 		$this->request = new stdClass();
+		
+		// Is it over SSL?
+		$this->request->ssl = $this->_detect_ssl();
+		
+		// How is this request being made? POST, DELETE, GET, PUT?
 		$this->request->method = $this->_detect_method();
 
 		// Create argument container, if nonexistent
@@ -250,6 +262,12 @@ public function __construct()
 	 */
 	public function _remap($object_called, $arguments)
 	{
+		// Should we answer if not over SSL?
+		if (config_item('force_https') AND !$this->_detect_ssl())
+		{
+    	   $this->response(array('status' => false, 'error' => 'Unsupported protocol'), 403);	
+		}
+		
 		$pattern = '/^(.*)\.('.implode('|', array_keys($this->_supported_formats)).')$/';
 		if (preg_match($pattern, $object_called, $matches))
 		{
@@ -407,6 +425,17 @@ public function response($data = array(), $http_code = null)
 		exit($output);
 	}
 
+	/*
+	 * Detect SSL use
+	 *
+	 * Detect whether SSL is being used or not
+	 */
+	protected function _detect_ssl()
+	{
+    		return (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on"));
+	}
+	
+	
 	/*
 	 * Detect input format
 	 *
@@ -569,16 +598,18 @@ protected function _detect_api_key()
 		// Find the key from server or arguments
 		if (($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name)))
 		{
-			if ( ! ($row = $this->rest->db->where('key', $key)->get(config_item('rest_keys_table'))->row()))
+			if ( ! ($this->client = $this->rest->db->where(config_item('rest_key_column'), $key)->get(config_item('rest_keys_table'))->row()))
 			{
 				return FALSE;
 			}
 
-			$this->rest->key = $row->key;
+			$this->rest->key = $this->client->{config_item('rest_key_column')};
 
+			/*
 			isset($row->user_id) AND $this->rest->user_id = $row->user_id;
 			isset($row->level) AND $this->rest->level = $row->level;
 			isset($row->ignore_limits) AND $this->rest->ignore_limits = $row->ignore_limits;
+			*/
 
 			if(!empty($row->is_private_key))
 			{
@@ -607,7 +638,7 @@ protected function _detect_api_key()
 				}
 			}
 
-			return TRUE;
+			return $this->client;
 		}
 
 		// No key has been sent

system/core/CodeIgniter.php

@@ -33,7 +33,7 @@
  * @var string
  *
  */
-	define('CI_VERSION', '2.1.0');
+	define('CI_VERSION', '2.1.2');
 
 /**
  * CodeIgniter Branch (Core = TRUE, Reactor = FALSE)