Merged in updates from the philsturgeon/codeigniter-restserver

repository.

Author: awhitney42

application/controllers/api/key.php

@@ -235,14 +235,14 @@ private function _generate_key()
 
 	private function _get_key($key)
 	{
-		return $this->db->where('key', $key)->get(config_item('rest_keys_table'))->row();
+		return $this->db->where(config_item('rest_key_column'), $key)->get(config_item('rest_keys_table'))->row();
 	}
 
 	// --------------------------------------------------------------------
 
 	private function _key_exists($key)
 	{
-		return $this->db->where('key', $key)->count_all_results(config_item('rest_keys_table')) > 0;
+		return $this->db->where(config_item('rest_key_column'), $key)->count_all_results(config_item('rest_keys_table')) > 0;
 	}
 
 	// --------------------------------------------------------------------
@@ -260,13 +260,13 @@ private function _insert_key($key, $data)
 
 	private function _update_key($key, $data)
 	{
-		return $this->db->where('key', $key)->update(config_item('rest_keys_table'), $data);
+		return $this->db->where(config_item('rest_key_column'), $key)->update(config_item('rest_keys_table'), $data);
 	}
 
 	// --------------------------------------------------------------------
 
 	private function _delete_key($key)
 	{
-		return $this->db->where('key', $key)->delete(config_item('rest_keys_table'));
+		return $this->db->where(config_item('rest_key_column'), $key)->delete(config_item('rest_keys_table'));
 	}
 }

application/libraries/Format.php

@@ -197,9 +197,10 @@ public function to_csv()
 			$data = array($data);
 		}
 
-		$output = implode(',', $headings).PHP_EOL;
+		$output = '"'.implode('","', $headings).'"'.PHP_EOL;
 		foreach ($data as &$row)
 		{
+			$row = str_replace('"', '""', $row); // Escape dbl quotes per RFC 4180
 			$output .= '"'.implode('","', $row).'"'.PHP_EOL;
 		}
 
@@ -209,7 +210,7 @@ public function to_csv()
 	// Encode as JSON
 	public function to_json()
 	{
-		return json_encode($this->_data);
+	   	return json_encode($this->_data);
 	}
 
 	// Encode as Serialized array

application/libraries/REST_Controller.php

@@ -146,6 +146,11 @@ protected function early_checks()
 	public function __construct()
 	{
 		parent::__construct();
+		
+		// init objects
+		$this->request = new stdClass();
+		$this->response = new stdClass();
+		$this->rest = new stdClass();
 
 		$this->_zlib_oc = @ini_get('zlib.output_compression');
 
@@ -170,8 +175,6 @@ public function __construct()
 		// Set up our GET variables
 		$this->_get_args = array_merge($this->_get_args, $this->uri->ruri_to_assoc(2));
 
-		$this->load->library('security');
-
 		// This library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter itself
 		$this->load->library('format');
 
@@ -197,7 +200,7 @@ public function __construct()
 		// Which format should the data be returned in?
 		$this->response = new stdClass();
 		$this->response->format = $this->_detect_output_format();
-		
+
 		// Which format should the data be returned in?
 		$this->response->lang = $this->_detect_lang();
 
@@ -232,7 +235,7 @@ public function __construct()
 		}
 
 		// Use whatever database is in use (isset returns false)
-		elseif (@$this->db)
+		elseif (property_exists($this, "db"))
 		{
 			$this->rest->db = $this->db;
 		}
@@ -1089,7 +1092,7 @@ protected function _check_login($username = '', $password = NULL)
 			return $this->_perform_ldap_auth($username, $password);
 		}
 
-		$valid_logins = & $this->config->item('rest_valid_logins');
+		$valid_logins = $this->config->item('rest_valid_logins');
 
 		if ( ! array_key_exists($username, $valid_logins))
 		{
@@ -1184,7 +1187,7 @@ protected function _prepare_digest_auth()
 			$this->_force_login($uniqid);
 		}
 
-		$valid_logins = & $this->config->item('rest_valid_logins');
+		$valid_logins = $this->config->item('rest_valid_logins');
 		$valid_pass = $valid_logins[$digest['username']];
 
 		// This is the valid response expected